diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 293ac6e4bc..3760c89f7e 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -67,6 +67,7 @@ import type {
   UnreadStats,
 } from '../../util/countUnreadStats.js';
 import {
+  isChatFoldersEnabled,
   isConversationInChatFolder,
   type ChatFolder,
 } from '../../types/ChatFolder.js';
@@ -426,6 +427,7 @@ export const _getLeftPaneLists = ({
     let conversation = values[i];
 
     if (
+      isChatFoldersEnabled() &&
       !_shouldIncludeInChatFolder(
         conversation,
         selectedChatFolder,