diff --git a/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx b/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx
index 0c3f8410f..2a713489e 100644
--- a/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx
+++ b/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx
@@ -89,7 +89,7 @@ export const OverlayDisappearingMessages = () => {
   const weAreAdmin = useSelectedWeAreAdmin();
 
   const [modeSelected, setModeSelected] = useState<DisappearingMessageConversationType | undefined>(
-    expirationType
+    hasOnlyOneMode ? singleMode : expirationType
   );
 
   const [timeSelected, setTimeSelected] = useState(expireTimer || 0);
diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts
index 2ffeb94b1..9cdb5388a 100644
--- a/ts/hooks/useParamSelector.ts
+++ b/ts/hooks/useParamSelector.ts
@@ -331,7 +331,7 @@ export function useTimerOptionsByMode(disappearingMessageMode?: string, hasOnlyO
           );
         });
       default:
-        return options;
+        return [];
     }
   });
 }