diff --git a/include/class.thread_actions.php b/include/class.thread_actions.php
index ee0c8b16d9b98868144375ad96a78d60c89503f9..8cc2d785d2f2c29ab1274e4e349a9c3936e40784 100644
--- a/include/class.thread_actions.php
+++ b/include/class.thread_actions.php
@@ -135,7 +135,7 @@ class TEA_EditThreadEntry extends ThreadEntryAction {
                 && $T->getDept()->getManagerId() == $thisstaff->getId()
             )
             || ($T instanceof Ticket
-                && ($role = $T->getRole($thisstaff))
+                && ($role = $thisstaff->getRole($T->getDeptId(), $T->isAssigned($thisstaff)))
                 && $role->hasPerm(ThreadEntry::PERM_EDIT)
             )
         );