diff --git a/apps/roam/src/components/settings/DiscourseNodeCanvasSettings.tsx b/apps/roam/src/components/settings/DiscourseNodeCanvasSettings.tsx
index ac39d0e15..ebc47d1ad 100644
--- a/apps/roam/src/components/settings/DiscourseNodeCanvasSettings.tsx
+++ b/apps/roam/src/components/settings/DiscourseNodeCanvasSettings.tsx
@@ -6,12 +6,12 @@ import {
   Tooltip,
   Icon,
   ControlGroup,
-  Checkbox,
 } from "@blueprintjs/core";
 import React, { useState, useMemo } from "react";
 import getBasicTreeByParentUid from "roamjs-components/queries/getBasicTreeByParentUid";
 import getSettingValueFromTree from "roamjs-components/util/getSettingValueFromTree";
 import setInputSetting from "roamjs-components/util/setInputSetting";
+import { DiscourseNodeFlagPanel } from "./components/BlockPropSettingPanels";
 
 export const formatHexColor = (color: string) => {
   if (!color) return "";
@@ -25,7 +25,13 @@ export const formatHexColor = (color: string) => {
   return "";
 };
 
-const DiscourseNodeCanvasSettings = ({ uid }: { uid: string }) => {
+const DiscourseNodeCanvasSettings = ({
+  nodeType,
+  uid,
+}: {
+  nodeType: string;
+  uid: string;
+}) => {
   const tree = useMemo(() => getBasicTreeByParentUid(uid), [uid]);
   const [color, setColor] = useState<string>(() => {
     const color = getSettingValueFromTree({ tree, key: "color" });
@@ -43,6 +49,7 @@ const DiscourseNodeCanvasSettings = ({ uid }: { uid: string }) => {
   const [keyImageOption, setKeyImageOption] = useState(() =>
     getSettingValueFromTree({ tree, key: "key-image-option" }),
   );
+
   return (
     <div>
       <div className="mb-4">
@@ -54,7 +61,7 @@ const DiscourseNodeCanvasSettings = ({ uid }: { uid: string }) => {
             value={color}
             onChange={(e) => {
               setColor(e.target.value);
-              setInputSetting({
+              void setInputSetting({
                 blockUid: uid,
                 key: "color",
                 value: e.target.value.replace("#", ""), // remove hash to not create roam link
@@ -67,7 +74,7 @@ const DiscourseNodeCanvasSettings = ({ uid }: { uid: string }) => {
               icon={color ? "delete" : "info-sign"}
               onClick={() => {
                 setColor("");
-                setInputSetting({
+                void setInputSetting({
                   blockUid: uid,
                   key: "color",
                   value: "",
@@ -83,7 +90,7 @@ const DiscourseNodeCanvasSettings = ({ uid }: { uid: string }) => {
           value={alias}
           onChange={(e) => {
             setAlias(e.target.value);
-            setInputSetting({
+            void setInputSetting({
               blockUid: uid,
               key: "alias",
               value: e.target.value,
@@ -91,49 +98,33 @@ const DiscourseNodeCanvasSettings = ({ uid }: { uid: string }) => {
           }}
         />
       </Label>
-      <Checkbox
-        style={{ width: 240, lineHeight: "normal" }}
-        checked={isKeyImage}
-        onChange={(e) => {
-          const target = e.target as HTMLInputElement;
-          setIsKeyImage(target.checked);
-          if (target.checked) {
-            if (!keyImageOption) setKeyImageOption("first-image");
-            setInputSetting({
-              blockUid: uid,
-              key: "key-image",
-              value: "true",
-            });
-          } else {
-            setInputSetting({
-              blockUid: uid,
-              key: "key-image",
-              value: "false",
-            });
-          }
+      <DiscourseNodeFlagPanel
+        nodeType={nodeType}
+        title="Key image"
+        description="Add an image to the discourse node"
+        settingKeys={["canvasSettings", "key-image"]}
+        initialValue={isKeyImage}
+        onChange={(checked) => {
+          setIsKeyImage(checked);
+          if (checked && !keyImageOption) setKeyImageOption("first-image");
+          void setInputSetting({
+            blockUid: uid,
+            key: "key-image",
+            value: checked ? "true" : "false",
+          });
         }}
-      >
-        Key image
-        <Tooltip content={"Add an image to the discourse node"}>
-          <Icon
-            icon={"info-sign"}
-            iconSize={12}
-            className={"ml-2 align-middle opacity-80"}
-          />
-        </Tooltip>
-      </Checkbox>
-      {/* </Tooltip> */}
+      />
       <RadioGroup
         disabled={!isKeyImage}
-        selectedValue={!!keyImageOption ? keyImageOption : "first-image"}
+        selectedValue={keyImageOption || "first-image"}
         label="Key image location"
         onChange={(e) => {
-          const target = e.target as HTMLInputElement;
-          setKeyImageOption(target.value);
-          setInputSetting({
+          const value = (e.target as HTMLInputElement).value;
+          setKeyImageOption(value);
+          void setInputSetting({
             blockUid: uid,
             key: "key-image-option",
-            value: target.value,
+            value,
           });
         }}
       >
@@ -155,7 +146,7 @@ const DiscourseNodeCanvasSettings = ({ uid }: { uid: string }) => {
         value={queryBuilderAlias}
         onChange={(e) => {
           setQueryBuilderAlias(e.target.value);
-          setInputSetting({
+          void setInputSetting({
             blockUid: uid,
             key: "query-builder-alias",
             value: e.target.value,
diff --git a/apps/roam/src/components/settings/DiscourseNodeSuggestiveRules.tsx b/apps/roam/src/components/settings/DiscourseNodeSuggestiveRules.tsx
index 988928bfb..70088313f 100644
--- a/apps/roam/src/components/settings/DiscourseNodeSuggestiveRules.tsx
+++ b/apps/roam/src/components/settings/DiscourseNodeSuggestiveRules.tsx
@@ -1,21 +1,16 @@
-import React, {
-  useState,
-  useMemo,
-  useEffect,
-  useRef,
-  useCallback,
-} from "react";
+import React, { useState, useMemo, useEffect, useRef } from "react";
 import { Button, Intent } from "@blueprintjs/core";
 import BlocksPanel from "roamjs-components/components/ConfigPanels/BlocksPanel";
-import FlagPanel from "roamjs-components/components/ConfigPanels/FlagPanel";
-import TextPanel from "roamjs-components/components/ConfigPanels/TextPanel";
 import getSubTree from "roamjs-components/util/getSubTree";
 import { DiscourseNode } from "~/utils/getDiscourseNodes";
 import extractRef from "roamjs-components/util/extractRef";
 import { getAllDiscourseNodesSince } from "~/utils/getAllDiscourseNodesSince";
 import { upsertNodesToSupabaseAsContentWithEmbeddings } from "~/utils/syncDgNodesToSupabase";
-import { discourseNodeBlockToLocalConcept } from "~/utils/conceptConversion";
 import { getLoggedInClient, getSupabaseContext } from "~/utils/supabaseContext";
+import {
+  DiscourseNodeFlagPanel,
+  DiscourseNodeTextPanel,
+} from "./components/BlockPropSettingPanels";
 
 const BlockRenderer = ({ uid }: { uid: string }) => {
   const containerRef = useRef<HTMLDivElement>(null);
@@ -44,12 +39,7 @@ const DiscourseNodeSuggestiveRules = ({
 }) => {
   const nodeUid = node.type;
 
-  const [embeddingRef, setEmbeddingRef] = useState(node.embeddingRef);
-
-  useEffect(() => {
-    setEmbeddingRef(node.embeddingRef || "");
-  }, [node.embeddingRef]);
-
+  const [embeddingRef, setEmbeddingRef] = useState(node.embeddingRef || "");
   const blockUidToRender = useMemo(
     () => extractRef(embeddingRef),
     [embeddingRef],
@@ -64,14 +54,6 @@ const DiscourseNodeSuggestiveRules = ({
     [nodeUid],
   );
 
-  const handleEmbeddingRefChange = useCallback(
-    (e: React.ChangeEvent<HTMLInputElement>) => {
-      const newValue = e.target.value;
-      setEmbeddingRef(newValue);
-      node.embeddingRef = newValue;
-    },
-    [node],
-  );
   const [isUpdating, setIsUpdating] = useState(false);
 
   const handleUpdateEmbeddings = async (): Promise<void> => {
@@ -96,6 +78,7 @@ const DiscourseNodeSuggestiveRules = ({
       setIsUpdating(false);
     }
   };
+
   return (
     <div className="flex flex-col gap-4 p-4">
       <BlocksPanel
@@ -107,17 +90,17 @@ const DiscourseNodeSuggestiveRules = ({
         defaultValue={node.template}
       />
 
-      <TextPanel
+      <DiscourseNodeTextPanel
+        nodeType={nodeUid}
         title="Embedding Block Ref"
         description="Copy block ref from template which you want to be embedded and ranked."
+        settingKeys={["suggestiveRules", "embeddingRef"]}
+        initialValue={node.embeddingRef || ""}
+        placeholder="((block-uid))"
+        onChange={setEmbeddingRef}
         order={1}
         uid={node.embeddingRefUid || ""}
         parentUid={parentUid}
-        defaultValue={embeddingRef || ""}
-        options={{
-          placeholder: "((block-uid))",
-          onChange: handleEmbeddingRefChange,
-        }}
       />
 
       {blockUidToRender && (
@@ -127,13 +110,15 @@ const DiscourseNodeSuggestiveRules = ({
         </div>
       )}
 
-      <FlagPanel
+      <DiscourseNodeFlagPanel
+        nodeType={nodeUid}
         title="First Child"
         description="If the block is the first child of the embedding block ref, it will be embedded and ranked."
+        settingKeys={["suggestiveRules", "isFirstChild"]}
+        initialValue={node.isFirstChild?.value || false}
         order={2}
         uid={node.isFirstChild?.uid || ""}
         parentUid={parentUid}
-        value={node.isFirstChild?.value || false}
       />
 
       <Button
diff --git a/apps/roam/src/components/settings/NodeConfig.tsx b/apps/roam/src/components/settings/NodeConfig.tsx
index 8fb3655b3..404e8bfeb 100644
--- a/apps/roam/src/components/settings/NodeConfig.tsx
+++ b/apps/roam/src/components/settings/NodeConfig.tsx
@@ -6,20 +6,11 @@ import React, {
   useMemo,
 } from "react";
 import { DiscourseNode } from "~/utils/getDiscourseNodes";
-import FlagPanel from "roamjs-components/components/ConfigPanels/FlagPanel";
 import SelectPanel from "roamjs-components/components/ConfigPanels/SelectPanel";
 import BlocksPanel from "roamjs-components/components/ConfigPanels/BlocksPanel";
-import TextPanel from "roamjs-components/components/ConfigPanels/TextPanel";
 import { getSubTree } from "roamjs-components/util";
 import Description from "roamjs-components/components/Description";
-import {
-  Label,
-  Tabs,
-  Tab,
-  TabId,
-  InputGroup,
-  TextArea,
-} from "@blueprintjs/core";
+import { Label, Tabs, Tab, TabId, InputGroup } from "@blueprintjs/core";
 import DiscourseNodeSpecification from "./DiscourseNodeSpecification";
 import DiscourseNodeAttributes from "./DiscourseNodeAttributes";
 import DiscourseNodeCanvasSettings from "./DiscourseNodeCanvasSettings";
@@ -31,6 +22,10 @@ import updateBlock from "roamjs-components/writes/updateBlock";
 import DiscourseNodeSuggestiveRules from "./DiscourseNodeSuggestiveRules";
 import { getFormattedConfigTree } from "~/utils/discourseConfigRef";
 import refreshConfigTree from "~/utils/refreshConfigTree";
+import {
+  DiscourseNodeTextPanel,
+  DiscourseNodeFlagPanel,
+} from "./components/BlockPropSettingPanels";
 
 export const getCleanTagText = (tag: string): string => {
   return tag.replace(/^#+/, "").trim().toUpperCase();
@@ -70,37 +65,6 @@ const ValidatedInputPanel = ({
   </div>
 );
 
-const ValidatedTextareaPanel = ({
-  label,
-  description,
-  value,
-  onChange,
-  onBlur,
-  placeholder,
-}: {
-  label: string;
-  description: string;
-  value: string;
-  onChange: (e: React.ChangeEvent<HTMLTextAreaElement>) => void;
-  onBlur: () => void;
-  placeholder?: string;
-}) => (
-  <div className="flex flex-col">
-    <Label>
-      {label}
-      <Description description={description} />
-      <TextArea
-        value={value}
-        onChange={onChange}
-        onBlur={onBlur}
-        placeholder={placeholder}
-        className="w-full"
-        style={{ minHeight: 80, resize: "vertical" }}
-      />
-    </Label>
-  </div>
-);
-
 const useDebouncedRoamUpdater = <
   T extends HTMLInputElement | HTMLTextAreaElement,
 >(
@@ -202,15 +166,7 @@ const NodeConfig = ({
   const [formatError, setFormatError] = useState("");
   const isConfigurationValid = !tagError && !formatError;
 
-  const {
-    value: tagValue,
-    handleChange: handleTagChange,
-    handleBlur: handleTagBlurFromHook,
-  } = useDebouncedRoamUpdater<HTMLInputElement>(
-    tagUid,
-    node.tag || "",
-    isConfigurationValid,
-  );
+  const [tagValue, setTagValue] = useState(node.tag || "");
   const {
     value: formatValue,
     handleChange: handleFormatChange,
@@ -220,16 +176,6 @@ const NodeConfig = ({
     node.format,
     isConfigurationValid,
   );
-  const {
-    value: descriptionValue,
-    handleChange: handleDescriptionChange,
-    handleBlur: handleDescriptionBlur,
-  } = useDebouncedRoamUpdater<HTMLTextAreaElement>(
-    descriptionUid,
-    node.description || "",
-    true,
-  );
-
   const validate = useCallback(
     ({
       tag,
@@ -289,11 +235,6 @@ const NodeConfig = ({
     validate({ tag: tagValue, format: formatValue });
   }, [tagValue, formatValue, validate]);
 
-  const handleTagBlur = useCallback(() => {
-    handleTagBlurFromHook();
-    validate({ tag: tagValue, format: formatValue });
-  }, [handleTagBlurFromHook, tagValue, formatValue, validate]);
-
   const handleFormatBlur = useCallback(() => {
     handleFormatBlurFromHook();
     validate({ tag: tagValue, format: formatValue });
@@ -311,29 +252,39 @@ const NodeConfig = ({
           title="General"
           panel={
             <div className="flex flex-col gap-4 p-1">
-              <ValidatedTextareaPanel
-                label="Description"
+              <DiscourseNodeTextPanel
+                nodeType={node.type}
+                title="Description"
                 description={`Describing what the ${node.text} node represents in your graph.`}
-                value={descriptionValue}
-                onChange={handleDescriptionChange}
-                onBlur={handleDescriptionBlur}
+                settingKeys={["description"]}
+                initialValue={node.description}
+                multiline
+                order={1}
+                parentUid={node.type}
+                uid={descriptionUid}
               />
-              <TextPanel
+              <DiscourseNodeTextPanel
+                nodeType={node.type}
                 title="Shortcut"
                 description={`The trigger to quickly create a ${node.text} page from the node menu.`}
+                settingKeys={["shortcut"]}
+                initialValue={node.shortcut}
                 order={0}
                 parentUid={node.type}
                 uid={shortcutUid}
-                defaultValue={node.shortcut}
               />
-              <ValidatedInputPanel
-                label="Tag"
+              <DiscourseNodeTextPanel
+                nodeType={node.type}
+                title="Tag"
                 description={`Designate a hashtag for marking potential ${node.text}.`}
-                value={tagValue}
-                onChange={handleTagChange}
-                onBlur={handleTagBlur}
-                error={tagError}
+                settingKeys={["tag"]}
+                initialValue={node.tag}
                 placeholder={generateTagPlaceholder(node)}
+                error={tagError}
+                onChange={setTagValue}
+                order={2}
+                parentUid={node.type}
+                uid={tagUid}
               />
             </div>
           }
@@ -426,14 +377,19 @@ const NodeConfig = ({
           title="Canvas"
           panel={
             <div className="flex flex-col gap-4 p-1">
-              <DiscourseNodeCanvasSettings uid={canvasUid} />
-              <FlagPanel
+              <DiscourseNodeCanvasSettings
+                nodeType={node.type}
+                uid={canvasUid}
+              />
+              <DiscourseNodeFlagPanel
+                nodeType={node.type}
                 title="Graph Overview"
                 description="Whether to color the node in the graph overview based on canvas color.  This is based on the node's plain title as described by a \`has title\` condition in its specification."
+                settingKeys={["graphOverview"]}
+                initialValue={node.graphOverview}
                 order={0}
                 parentUid={node.type}
                 uid={graphOverviewUid}
-                value={node.graphOverview}
               />
             </div>
           }
diff --git a/apps/roam/src/components/settings/components/BlockPropSettingPanels.tsx b/apps/roam/src/components/settings/components/BlockPropSettingPanels.tsx
index 599c11ef7..1e1b0d6f2 100644
--- a/apps/roam/src/components/settings/components/BlockPropSettingPanels.tsx
+++ b/apps/roam/src/components/settings/components/BlockPropSettingPanels.tsx
@@ -1,4 +1,10 @@
-import React, { type ChangeEvent, useState, useCallback, useRef } from "react";
+import React, {
+  type ChangeEvent,
+  useState,
+  useCallback,
+  useRef,
+  useEffect,
+} from "react";
 import {
   Checkbox,
   InputGroup,
@@ -7,6 +13,7 @@ import {
   HTMLSelect,
   Button,
   Tag,
+  TextArea,
 } from "@blueprintjs/core";
 import Description from "roamjs-components/components/Description";
 import useSingleChildValue from "roamjs-components/components/ConfigPanels/useSingleChildValue";
@@ -15,8 +22,10 @@ import {
   setGlobalSetting,
   setPersonalSetting,
   setFeatureFlag,
+  setDiscourseNodeSetting,
 } from "~/components/settings/utils/accessors";
-import type { FeatureFlags } from "~/components/settings/utils/zodSchema";
+import type { FeatureFlags } from "../utils/zodSchema";
+import type { json } from "~/utils/getBlockProps";
 
 type RoamBlockSyncProps = {
   parentUid?: string;
@@ -31,7 +40,6 @@ type FlagSetter = (keys: string[], value: boolean) => void;
 type NumberSetter = (keys: string[], value: number) => void;
 
 type MultiTextSetter = (keys: string[], value: string[]) => void;
-
 type BaseTextPanelProps = {
   title: string;
   description: string;
@@ -39,6 +47,8 @@ type BaseTextPanelProps = {
   setter: TextSetter;
   initialValue?: string;
   placeholder?: string;
+  multiline?: boolean;
+  error?: string;
   onChange?: (value: string) => void;
 } & RoamBlockSyncProps;
 
@@ -83,6 +93,8 @@ type BaseMultiTextPanelProps = {
   onChange?: (values: string[]) => void;
 } & RoamBlockSyncProps;
 
+const DEBOUNCE_MS = 250;
+
 const BaseTextPanel = ({
   title,
   description,
@@ -90,12 +102,17 @@ const BaseTextPanel = ({
   setter,
   initialValue,
   placeholder,
+  multiline,
+  error,
   onChange,
   parentUid,
   uid,
   order,
 }: BaseTextPanelProps) => {
   const [value, setValue] = useState(() => initialValue ?? "");
+  const errorRef = useRef(error);
+  errorRef.current = error;
+  const debounceRef = useRef(0);
   const hasBlockSync = parentUid !== undefined && order !== undefined;
   const { onChange: rawSyncToBlock } = useSingleChildValue({
     title,
@@ -108,24 +125,50 @@ const BaseTextPanel = ({
   });
   const syncToBlock = hasBlockSync ? rawSyncToBlock : undefined;
 
-  const handleChange = (e: ChangeEvent<HTMLInputElement>) => {
+  useEffect(() => {
+    return () => window.clearTimeout(debounceRef.current);
+  }, []);
+
+  const handleChange = (
+    e: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,
+  ) => {
     const newValue = e.target.value;
     setValue(newValue);
-    setter(settingKeys, newValue);
-    syncToBlock?.(newValue);
     onChange?.(newValue);
+
+    window.clearTimeout(debounceRef.current);
+    debounceRef.current = window.setTimeout(() => {
+      if (errorRef.current) return;
+      setter(settingKeys, newValue);
+      syncToBlock?.(newValue);
+    }, DEBOUNCE_MS);
   };
 
   return (
-    <Label>
-      {title}
-      <Description description={description} />
-      <InputGroup
-        value={value}
-        onChange={handleChange}
-        placeholder={placeholder || initialValue}
-      />
-    </Label>
+    <div className="flex flex-col">
+      <Label>
+        {title}
+        <Description description={description} />
+        {multiline ? (
+          <TextArea
+            value={value}
+            onChange={handleChange}
+            placeholder={placeholder || initialValue}
+            className="w-full"
+            style={{ minHeight: 80, resize: "vertical" }}
+          />
+        ) : (
+          <InputGroup
+            value={value}
+            onChange={handleChange}
+            placeholder={placeholder || initialValue}
+          />
+        )}
+      </Label>
+      {error && (
+        <div className="mt-1 text-sm font-medium text-red-600">{error}</div>
+      )}
+    </div>
   );
 };
 
@@ -533,3 +576,62 @@ export const PersonalSelectPanel = (props: SelectWrapperProps) => (
 export const PersonalMultiTextPanel = (props: MultiTextWrapperProps) => (
   <BaseMultiTextPanel {...props} {...personalAccessors.multiText} />
 );
+
+const createDiscourseNodeSetter =
+  (nodeType: string) =>
+  (keys: string[], value: json): void =>
+    setDiscourseNodeSetting(nodeType, keys, value);
+
+type DiscourseNodeBaseProps = {
+  nodeType: string;
+  title: string;
+  description: string;
+  settingKeys: string[];
+};
+
+export const DiscourseNodeTextPanel = ({
+  nodeType,
+  ...props
+}: DiscourseNodeBaseProps &
+  RoamBlockSyncProps & {
+    initialValue?: string;
+    placeholder?: string;
+    multiline?: boolean;
+    error?: string;
+    onChange?: (value: string) => void;
+  }) => (
+  <BaseTextPanel {...props} setter={createDiscourseNodeSetter(nodeType)} />
+);
+
+export const DiscourseNodeFlagPanel = ({
+  nodeType,
+  ...props
+}: DiscourseNodeBaseProps &
+  RoamBlockSyncProps & {
+    initialValue?: boolean;
+    disabled?: boolean;
+    onBeforeChange?: (checked: boolean) => Promise<boolean>;
+    onChange?: (checked: boolean) => void;
+  }) => (
+  <BaseFlagPanel {...props} setter={createDiscourseNodeSetter(nodeType)} />
+);
+
+export const DiscourseNodeSelectPanel = ({
+  nodeType,
+  ...props
+}: DiscourseNodeBaseProps &
+  RoamBlockSyncProps & { options: string[]; initialValue?: string }) => (
+  <BaseSelectPanel {...props} setter={createDiscourseNodeSetter(nodeType)} />
+);
+
+export const DiscourseNodeNumberPanel = ({
+  nodeType,
+  ...props
+}: DiscourseNodeBaseProps &
+  RoamBlockSyncProps & {
+    initialValue?: number;
+    min?: number;
+    max?: number;
+  }) => (
+  <BaseNumberPanel {...props} setter={createDiscourseNodeSetter(nodeType)} />
+);
diff --git a/apps/roam/src/components/settings/utils/zodSchema.example.ts b/apps/roam/src/components/settings/utils/zodSchema.example.ts
index 671a6b67b..ee9187912 100644
--- a/apps/roam/src/components/settings/utils/zodSchema.example.ts
+++ b/apps/roam/src/components/settings/utils/zodSchema.example.ts
@@ -35,10 +35,7 @@ const suggestiveRules: SuggestiveRules = {
     { text: "Key Points::", heading: 2, children: [{ text: "" }] },
   ],
   embeddingRef: "((block-uid-123))",
-  isFirstChild: {
-    uid: "first-child-uid",
-    value: true,
-  },
+  isFirstChild: true,
 };
 
 const discourseNodeSettings: DiscourseNodeSettings = {
@@ -61,10 +58,7 @@ const discourseNodeSettings: DiscourseNodeSettings = {
     { text: "Evidence::", heading: 2, children: [{ text: "" }] },
     { text: "Counterarguments::", heading: 2, children: [{ text: "" }] },
   ],
-  canvasSettings: {
-    color: "#4A90D9",
-    alias: "CLM",
-  },
+  canvasSettings,
   graphOverview: true,
   attributes: {
     Status: "status-attr-uid",
@@ -82,19 +76,7 @@ const discourseNodeSettings: DiscourseNodeSettings = {
     ],
     selections: [],
   },
-  suggestiveRules: {
-    template: [],
-    embeddingRef: "((embed-ref))",
-    isFirstChild: {
-      uid: "is-first-child-uid",
-      value: false,
-    },
-  },
-  embeddingRef: "((main-embed-ref))",
-  isFirstChild: {
-    uid: "main-first-child-uid",
-    value: true,
-  },
+  suggestiveRules,
   backedBy: "user",
 };
 
diff --git a/apps/roam/src/components/settings/utils/zodSchema.ts b/apps/roam/src/components/settings/utils/zodSchema.ts
index 1ea104535..3c354f8df 100644
--- a/apps/roam/src/components/settings/utils/zodSchema.ts
+++ b/apps/roam/src/components/settings/utils/zodSchema.ts
@@ -13,19 +13,6 @@ export const CanvasSettingsSchema = z.object({
   "query-builder-alias": z.string().default(""),
 });
 
-export const SuggestiveRulesSchema = z.lazy(() =>
-  z.object({
-    template: z.array(RoamNodeSchema).default([]),
-    embeddingRef: z.string().optional(),
-    isFirstChild: z
-      .object({
-        uid: z.string(),
-        value: z.boolean(),
-      })
-      .optional(),
-  }),
-);
-
 export const AttributesSchema = z.record(z.string(), z.string()).default({});
 
 const QBClauseDataSchema = z.object({
@@ -87,6 +74,12 @@ export const RoamNodeSchema: z.ZodType<RoamNode> = z.lazy(() =>
   }),
 );
 
+export const SuggestiveRulesSchema = z.object({
+  template: z.array(RoamNodeSchema).default([]),
+  embeddingRef: z.string().default(""),
+  isFirstChild: z.boolean().default(false),
+});
+
 const stringWithDefault = (defaultVal: string) =>
   z
     .string()
@@ -118,7 +111,7 @@ export const DiscourseNodeSchema = z.object({
     .nullable()
     .optional()
     .transform((val) => val ?? []),
-  canvasSettings: CanvasSettingsSchema.partial().nullable().optional(),
+  canvasSettings: CanvasSettingsSchema.default({}),
   graphOverview: booleanWithDefault(false),
   attributes: z
     .record(z.string(), z.string())
@@ -127,15 +120,7 @@ export const DiscourseNodeSchema = z.object({
     .transform((val) => val ?? {}),
   overlay: stringWithDefault(""),
   index: IndexSchema.nullable().optional(),
-  suggestiveRules: SuggestiveRulesSchema.nullable().optional(),
-  embeddingRef: stringWithDefault(""),
-  isFirstChild: z
-    .object({
-      uid: z.string(),
-      value: z.boolean(),
-    })
-    .nullable()
-    .optional(),
+  suggestiveRules: SuggestiveRulesSchema.default({}),
   backedBy: z
     .enum(["user", "default", "relation"])
     .nullable()
diff --git a/apps/roam/src/index.ts b/apps/roam/src/index.ts
index 9eb8095aa..0579784c3 100644
--- a/apps/roam/src/index.ts
+++ b/apps/roam/src/index.ts
@@ -42,7 +42,6 @@ import {
   DISALLOW_DIAGNOSTICS,
 } from "./data/userSettings";
 import { initSchema } from "./components/settings/utils/init";
-
 export const DEFAULT_CANVAS_PAGE_FORMAT = "Canvas/*";
 
 export default runExtension(async (onloadArgs) => {