diff --git a/includes/functions.php b/includes/functions.php
index 8b6352ffa4..20fa4b7a8b 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -920,14 +920,21 @@ function validate_device_id($id)
 {
 
   global $config;
-  $device_id = dbFetchCell("SELECT `device_id` FROM `devices` WHERE `device_id` = ?", array($id));
-  if($device_id == $id)
+  if(empty($id) || !is_numeric($id))
   {
-    $return = true;
+    $return = false;
   }
   else
   {
-    $return = false;
+    $device_id = dbFetchCell("SELECT `device_id` FROM `devices` WHERE `device_id` = ?", array($id));
+    if($device_id == $id)
+    {
+      $return = true;
+    }
+    else
+    {
+      $return = false;
+    }
   }
   return($return);
 }