diff --git a/include/conversation.php b/include/conversation.php
index ff5dc2aed7..d6b6bd8eee 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -619,7 +619,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
 		$community_readonly = ($mode === 'community');
 
 		// Currently behind a config value. This allows the commenting and sharing of every public item.
-		if (Config::get('system', 'comment_public') && local_user()) {
+		if (Config::get('system', 'comment_public')) {
 			if ($mode === 'community') {
 				$community_readonly = false;
 				$writable = true;
@@ -630,6 +630,10 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
 			$writable = false;
 		}
 
+		if (!local_user()) {
+			$writable = false;
+		}
+
 		if ($mode === 'network-new' || $mode === 'search' || $community_readonly) {
 
 			/*