diff --git a/apps/client/src/widgets/layout/ActiveContentBadges.tsx b/apps/client/src/widgets/layout/ActiveContentBadges.tsx
index 870533ba58..781f827553 100644
--- a/apps/client/src/widgets/layout/ActiveContentBadges.tsx
+++ b/apps/client/src/widgets/layout/ActiveContentBadges.tsx
@@ -72,7 +72,7 @@ const typeMappings: Record<ActiveContentInfo["type"], {
                 icon: "bx bx-layer",
                 dropStart: true,
                 options: [
-                    { label: t("theme.auto_theme"), value: "" },
+                    { label: t("theme.auto_theme"), value: null },
                     { type: "separator" },
                     { label: t("theme.triliumnext"), value: "next" },
                     { label: t("theme.triliumnext-light"), value: "next-light" },
diff --git a/apps/client/src/widgets/react/NotePropertyMenu.tsx b/apps/client/src/widgets/react/NotePropertyMenu.tsx
index 0c63f785c3..5384c400a4 100644
--- a/apps/client/src/widgets/react/NotePropertyMenu.tsx
+++ b/apps/client/src/widgets/react/NotePropertyMenu.tsx
@@ -46,7 +46,10 @@ export interface NumberProperty {
 }
 
 export interface ComboBoxItem {
-    value: string;
+    /**
+     * The value to set to the bound label, `null` has a special meaning which removes the label entirely.
+     */
+    value: string | null;
     label: string;
 }