diff --git a/ts/deck-options/CheckBoxRow.svelte b/ts/deck-options/CheckBoxRow.svelte
index fcb1122bc..491df91d7 100644
--- a/ts/deck-options/CheckBoxRow.svelte
+++ b/ts/deck-options/CheckBoxRow.svelte
@@ -5,7 +5,6 @@
 <script lang="ts">
     import Row from "./Row.svelte";
     import Col from "./Col.svelte";
-    import Label from "./Label.svelte";
     import TooltipLabel from "./TooltipLabel.svelte";
     import CheckBox from "./CheckBox.svelte";
     import RevertButton from "./RevertButton.svelte";
@@ -20,7 +19,7 @@
         <RevertButton bind:value {defaultValue} />
         <CheckBox bind:value
             >{#if markdownTooltip}<TooltipLabel {markdownTooltip}><slot /></TooltipLabel
-                >{:else}<Label><slot /></Label>{/if}</CheckBox
+                >{:else}<slot />{/if}</CheckBox
         >
     </Col>
 </Row>
diff --git a/ts/deck-options/TooltipLabel.svelte b/ts/deck-options/TooltipLabel.svelte
index b2a7337dc..4305df213 100644
--- a/ts/deck-options/TooltipLabel.svelte
+++ b/ts/deck-options/TooltipLabel.svelte
@@ -10,12 +10,16 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import Badge from "components/Badge.svelte";
 
     export let markdownTooltip: string;
-    let forId: string;
+    let forId: string | undefined = undefined;
     export { forId as for };
 </script>
 
 <span>
-    <Label for={forId}><slot /></Label>
+    {#if forId}
+        <Label for={forId}><slot /></Label>
+    {:else}
+        <slot />
+    {/if}
     <WithTooltip
         tooltip={marked(markdownTooltip)}
         showDelay={250}