diff --git a/includes/device-groups.inc.php b/includes/device-groups.inc.php
index a1573ec03..45d5afcd2 100644
--- a/includes/device-groups.inc.php
+++ b/includes/device-groups.inc.php
@@ -47,6 +47,9 @@ function GenGroupSQL($pattern, $search='') {
         }
     }
 
+    $pattern = rtrim($pattern, '&&');
+    $pattern = rtrim($pattern, '||');
+
     $tables = array_keys(array_flip($tables));
     $x      = sizeof($tables);
     $i      = 0;