diff --git a/eq-author/src/App/page/Logic/BinaryExpressionEditor/RoutingAnswerContentPicker.js b/eq-author/src/App/page/Logic/BinaryExpressionEditor/RoutingAnswerContentPicker.js
index d1ed240fe0..4eba90fc6b 100644
--- a/eq-author/src/App/page/Logic/BinaryExpressionEditor/RoutingAnswerContentPicker.js
+++ b/eq-author/src/App/page/Logic/BinaryExpressionEditor/RoutingAnswerContentPicker.js
@@ -45,7 +45,7 @@ const RoutingAnswerContentPicker = ({
   const filteredPreviousAnswers = previousAnswers.map((answer) => {
     return {
       ...answer,
-      folders: answer.folders.filter((folder) => !folder.listId),
+      folders: answer.folders.filter((folder) => folder.listId == null),
     };
   });
 
diff --git a/eq-author/src/components/RichTextEditor/PipingMenu.js b/eq-author/src/components/RichTextEditor/PipingMenu.js
index 16a5c8d225..21a787ddef 100644
--- a/eq-author/src/components/RichTextEditor/PipingMenu.js
+++ b/eq-author/src/components/RichTextEditor/PipingMenu.js
@@ -93,7 +93,7 @@ const PipingMenu = ({
   const filteredAnswerData = answerData.map((answer) => {
     return {
       ...answer,
-      folders: answer.folders.filter((folder) => !folder.listId),
+      folders: answer.folders.filter((folder) => folder.listId == null),
     };
   });