diff --git a/include/class.canned.php b/include/class.canned.php
index c84950e7d6d19b062dbb3a53c0ccfe95eab96c48..392a07ec2191cb08d298ce0027b688b0cf4f986f 100644
--- a/include/class.canned.php
+++ b/include/class.canned.php
@@ -217,11 +217,13 @@ class Canned {
 
     function getCannedResponses($deptId=0, $explicit=false) {
 
-        $sql='SELECT canned_id, title FROM '.CANNED_TABLE;
+        $sql='SELECT canned_id, title FROM '.CANNED_TABLE
+           .' WHERE isenabled';
         if($deptId){
-            $sql.=' WHERE dept_id='.db_input($deptId);
+            $sql.=' AND (dept_id='.db_input($deptId);
             if(!$explicit)
                 $sql.=' OR dept_id=0';
+            $sql.=')';
         }
         $sql.=' ORDER BY title';