diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index f3e484e15..8541eaa56 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -2301,7 +2301,12 @@ class ChatController(args: Bundle) :
             conversationInfoMenuItem = menu.findItem(R.id.conversation_info)
             conversationVoiceCallMenuItem = menu.findItem(R.id.conversation_voice_call)
             conversationVideoMenuItem = menu.findItem(R.id.conversation_video_call)
-            conversationSharedItemsItem = menu.findItem(R.id.shared_items)
+
+            if(CapabilitiesUtil.hasSpreedFeatureCapability(conversationUser, "rich-object-list-media")){
+                conversationSharedItemsItem = menu.findItem(R.id.shared_items)
+            } else {
+                menu.removeItem(R.id.shared_items)
+            }
 
             loadAvatarForStatusBar()
         }
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
index c853775a4..8fa50f086 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
@@ -175,7 +175,12 @@ class ConversationInfoController(args: Bundle) :
         binding.leaveConversationAction.setOnClickListener { leaveConversation() }
         binding.clearConversationHistory.setOnClickListener { showClearHistoryDialog(null) }
         binding.addParticipantsAction.setOnClickListener { addParticipants() }
-        binding.showSharedItemsAction.setOnClickListener { showSharedItems() }
+
+        if (CapabilitiesUtil.hasSpreedFeatureCapability(conversationUser, "rich-object-list-media")) {
+            binding.showSharedItemsAction.setOnClickListener { showSharedItems() }
+        } else {
+            binding.categorySharedItems.visibility = View.GONE
+        }
 
         fetchRoomInfo()
     }