diff --git a/include/staff/cannedresponses.inc.php b/include/staff/cannedresponses.inc.php
index 1a55d08db8..f9c2c0a3ee 100644
--- a/include/staff/cannedresponses.inc.php
+++ b/include/staff/cannedresponses.inc.php
@@ -1,13 +1,14 @@
 <?php
 if(!defined('OSTSCPINC') || !$thisstaff) die('Access Denied');
 
+$departments = implode(',', $thisstaff->getDepartments());
 $qs = array();
 $sql='SELECT canned.*, count(attach.file_id) as files, dept.name as department '.
      ' FROM '.CANNED_TABLE.' canned '.
      ' LEFT JOIN '.DEPT_TABLE.' dept ON (dept.id=canned.dept_id) '.
      ' LEFT JOIN '.ATTACHMENT_TABLE.' attach
             ON (attach.object_id=canned.canned_id AND attach.`type`=\'C\' AND NOT attach.inline)';
-$sql.=' WHERE 1';
+$sql.= sprintf(' WHERE canned.dept_id = 0 OR dept.id IN (%s)', $departments);
 
 $sortOptions=array('title'=>'canned.title','status'=>'canned.isenabled','dept'=>'department','updated'=>'canned.updated');
 $orderWays=array('DESC'=>'DESC','ASC'=>'ASC');