diff --git a/apps/client/src/widgets/dialogs/call_to_action.tsx b/apps/client/src/widgets/dialogs/call_to_action.tsx
index a9faca016..e26b0583e 100644
--- a/apps/client/src/widgets/dialogs/call_to_action.tsx
+++ b/apps/client/src/widgets/dialogs/call_to_action.tsx
@@ -21,7 +21,7 @@ const CALL_TO_ACTIONS: CallToAction[] = [
     {
         title: "TriliumNext theme is now stable",
         message: "For a while now, we've been working on a new theme to give the application a more modern look.",
-        enabled: isNextTheme,
+        enabled: () => !isNextTheme(),
         buttons: [
             { text: "Switch to the TriliumNext theme"}
         ]
@@ -41,6 +41,10 @@ function CallToActionDialogComponent({ activeCallToActions }: { activeCallToActi
     const [ shown, setShown ] = useState(true);
     const activeItem = activeCallToActions[activeIndex];
 
+    if (!activeCallToActions.length) {
+        return <></>;
+    }
+
     function goToNext() {
         if (activeIndex + 1 < activeCallToActions.length) {
             setActiveIndex(activeIndex + 1);