diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b1053e67..320292b65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - Fixed Undefined variable $wordCensor [\#1400](https://github.com/torrentpier/torrentpier/pull/1400) ([belomaxorka](https://github.com/belomaxorka))
 - Improved word censor 🤐 [\#1393](https://github.com/torrentpier/torrentpier/pull/1393) ([belomaxorka](https://github.com/belomaxorka))
 - Used hashing for filenames generation [\#1385](https://github.com/torrentpier/torrentpier/pull/1385) ([belomaxorka](https://github.com/belomaxorka))
+- Hide quote button if topic locked [\#1416](https://github.com/torrentpier/torrentpier/pull/1416) ([belomaxorka](https://github.com/belomaxorka))
 - Minor improvements [\#1382](https://github.com/torrentpier/torrentpier/pull/1382), [\#1383](https://github.com/torrentpier/torrentpier/pull/1383), [\#1391](https://github.com/torrentpier/torrentpier/pull/1391), [\#1398](https://github.com/torrentpier/torrentpier/pull/1398), [\#1405](https://github.com/torrentpier/torrentpier/pull/1405), [\#1406](https://github.com/torrentpier/torrentpier/pull/1406), [\#1408](https://github.com/torrentpier/torrentpier/pull/1408), [\#1409](https://github.com/torrentpier/torrentpier/pull/1409), [\#1410](https://github.com/torrentpier/torrentpier/pull/1410), [\#1411](https://github.com/torrentpier/torrentpier/pull/1411) ([belomaxorka](https://github.com/belomaxorka))
 - Some bugfixes [\#1380](https://github.com/torrentpier/torrentpier/pull/1380) ([belomaxorka](https://github.com/belomaxorka))
 - Updated deps [\#1414](https://github.com/torrentpier/torrentpier/pull/1414), [\#1415](https://github.com/torrentpier/torrentpier/pull/1415) ([belomaxorka](https://github.com/belomaxorka))
diff --git a/search.php b/search.php
index f374d5726..b20fe31ca 100644
--- a/search.php
+++ b/search.php
@@ -581,7 +581,7 @@ if ($post_mode) {
         // Topic posts block
         foreach ($topic_posts as $row_num => $post) {
             if ($post['poster_id'] != BOT_UID) {
-                $quote_btn = true;
+                $quote_btn = !IS_GUEST;
                 $edit_btn = $ip_btn = IS_AM;
             }
 
diff --git a/styles/templates/default/search_results.tpl b/styles/templates/default/search_results.tpl
index 4a229d24f..dc8bc2a1e 100644
--- a/styles/templates/default/search_results.tpl
+++ b/styles/templates/default/search_results.tpl
@@ -3,14 +3,16 @@
 <!-- ENDIF -->
 
 <div class="nav">
-	<a href="{U_INDEX}">{T_INDEX}</a>
-	<!-- IF MY_POSTS -->
-	&nbsp;&middot;&nbsp;
-	<span id="show-edit-btn"><a href="#">{L_EDIT_MY_MESSAGE_LIST}</a></span>
-	<span id="edit-sel-topics" style="display: none;"><a href="#" class="bold adm" onclick="$('input.topic-chbox').trigger('click'); return false;">{L_SELECT_INVERT}</a></span>
-	<!-- ENDIF -->
-	&nbsp;&middot;&nbsp;
-	<!-- IF LOGGED_IN --><a href="#" class="med normal" onclick="setCookie('{#COOKIE_MARK#}', 'all_forums'); window.location.reload();">{L_MARK_ALL_FORUMS_READ}</a><!-- ENDIF -->
+    <a href="{U_INDEX}">{T_INDEX}</a>
+    <!-- IF MY_POSTS -->
+    &nbsp;&middot;&nbsp;
+    <span id="show-edit-btn"><a href="#">{L_EDIT_MY_MESSAGE_LIST}</a></span>
+    <span id="edit-sel-topics" style="display: none;"><a href="#" class="bold adm" onclick="$('input.topic-chbox').trigger('click'); return false;">{L_SELECT_INVERT}</a></span>
+    <!-- ENDIF -->
+    <!-- IF LOGGED_IN -->
+    &nbsp;&middot;&nbsp;
+    <a href="#" class="med normal" onclick="setCookie('{#COOKIE_MARK#}', 'all_forums'); window.location.reload();">{L_MARK_ALL_FORUMS_READ}</a>
+    <!-- ENDIF -->
 </div>
 
 <!-- IF DISPLAY_AS_POSTS -->
diff --git a/viewtopic.php b/viewtopic.php
index 35dab0a74..ddd9b630f 100644
--- a/viewtopic.php
+++ b/viewtopic.php
@@ -603,7 +603,7 @@ for ($i = 0; $i < $total_posts; $i++) {
     }
 
     if (!$poster_bot) {
-        $quote_btn = true;
+        $quote_btn = ($is_auth['auth_reply'] && !($t_data['forum_status'] == FORUM_LOCKED || $t_data['topic_status'] == TOPIC_LOCKED));
         $edit_btn = (($userdata['user_id'] == $poster_id && $is_auth['auth_edit']) || $is_auth['auth_mod']);
         $ip_btn = ($is_auth['auth_mod'] || IS_MOD);
     }