diff --git a/html/includes/graphs/smokeping/in.inc.php b/html/includes/graphs/smokeping/in.inc.php
index 3114d6193..8c8024e24 100644
--- a/html/includes/graphs/smokeping/in.inc.php
+++ b/html/includes/graphs/smokeping/in.inc.php
@@ -31,9 +31,10 @@ if($width > "500")
   $rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)." RTT      Loss    SDev   RTT\:SDev                              \l'";
 }
 
+$filename_dir = generate_smokeping_dir($device);
 if($src['hostname'] == $config['own_hostname'])
 {
-    $filename_dir = generate_smokeping_dir($device);
+    $filename = $filename_dir . $device['hostname'].'.rrd';
   if (!file_exists($filename_dir.$device['hostname'].'.rrd'))
   {
     // Try with dots in hostname replaced by underscores
diff --git a/includes/common.php b/includes/common.php
index f931793f7..4885ba985 100644
--- a/includes/common.php
+++ b/includes/common.php
@@ -751,7 +751,7 @@ function get_smokeping_files($device) {
     global $config;
     if (isset($config['smokeping']['dir'])) {
         $smokeping_files = array();
-        $filename_dir = generate_smokeping_dir($device);
+        $smokeping_dir = generate_smokeping_dir($device);
         if ($handle = opendir($smokeping_dir)) {
             while (false !== ($file = readdir($handle))) {
                 if ($file != "." && $file != "..") {