diff --git a/src/components/Collection/Filter/DefaultCriteria.tsx b/src/components/Collection/Filter/DefaultCriteria.tsx
index bb221b6e1..80faa998c 100644
--- a/src/components/Collection/Filter/DefaultCriteria.tsx
+++ b/src/components/Collection/Filter/DefaultCriteria.tsx
@@ -24,7 +24,7 @@ const DefaultCriteria = ({ criteria }: Props) => {
   const selectedCondition = useSelector(
     (state: RootState) => {
       const value: boolean | undefined = state.collection.filterConditions[criteria.Expression];
-      if (value === true || value === false) {
+      if (value !== undefined) {
         return value ? '1' : '0';
       }
       return value;
diff --git a/src/components/Panels/ShokoPanel.tsx b/src/components/Panels/ShokoPanel.tsx
index f2a7f2aa2..4e5c56785 100644
--- a/src/components/Panels/ShokoPanel.tsx
+++ b/src/components/Panels/ShokoPanel.tsx
@@ -55,7 +55,7 @@ const ShokoPanel = (
     <div
       className={cx(
         'flex grow flex-col shoko-scrollbar',
-        disableOverflow === false && 'overflow-y-auto',
+        !disableOverflow && 'overflow-y-auto',
         contentClassName,
       )}
       style={{ overflowAnchor: 'none' }} // To fix scroll jumping around randomly when queue items change