diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
index 72b771fbea..f73fcfb3ad 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -1065,7 +1065,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
   }
 
   private void onChatFoldersChanged(List<ChatFolderMappingModel> folders) {
-    chatFolderList.setVisibility(folders.size() > 1 ? View.VISIBLE : View.GONE);
+    chatFolderList.setVisibility(folders.size() > 1 && !isArchived() ? View.VISIBLE : View.GONE);
     chatFolderAdapter.submitList(new ArrayList<>(folders));
   }