diff --git a/includes/functions.php b/includes/functions.php
index a6ef4cd425..0f4620cd95 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -236,7 +236,7 @@ function renamehost($id, $new, $source = 'console')
 
 function delete_device($id)
 {
-  global $config;
+  global $config, $debug;
   $ret = '';
 
   $host = dbFetchCell("SELECT hostname FROM devices WHERE device_id = ?", array($id));
@@ -252,13 +252,17 @@ function delete_device($id)
   $fields = array('device_id','host');
   foreach( $fields as $field ) {
     foreach( dbFetch("SELECT table_name FROM information_schema.columns WHERE table_schema = ? AND column_name = ?",array($config['db_name'],$field)) as $table ) {
-      dbDelete($table, "`$field` =  ?", array($id));
+      $table = $table['table_name'];
+      $entries = (int) dbDelete($table, "`$field` =  ?", array($id));
+      if( $entries > 0 && $debug === true ) {
+        $ret .= "$field@$table = #$entries\n";
+      }
     }
   }
 
   shell_exec("rm -rf ".trim($config['rrd_dir'])."/$host");
 
-  $ret = "Removed device $host";
+  $ret .= "Removed device $host\n";
   return $ret;
 }