diff --git a/include/client/view.inc.php b/include/client/view.inc.php
index ccea4c927cfdf31793ae325f79572a743fa35f26..fa8a5b4a5420df21565f463b79c59ac33ecceca7 100644
--- a/include/client/view.inc.php
+++ b/include/client/view.inc.php
@@ -65,7 +65,7 @@ if($ticket->getThreadCount() && ($thread=$ticket->getClientThread())) {
         //Making sure internal notes are not displayed due to backend MISTAKES!
         if(!$threadType[$entry['thread_type']]) continue;
         $poster = $entry['poster'];
-        if($entry['thread_type']=='R' && $cfg->hideStaffName())
+        if($entry['thread_type']=='R' && ($cfg->hideStaffName() || !$entry['staff_id']))
             $poster = ' ';
         ?>
         <table class="<?php echo $threadType[$entry['thread_type']]; ?>" cellspacing="0" cellpadding="1" width="800" border="0">