diff --git a/apps/roam/src/components/settings/AdminPanel.tsx b/apps/roam/src/components/settings/AdminPanel.tsx
index 85ba13269..4baac12b4 100644
--- a/apps/roam/src/components/settings/AdminPanel.tsx
+++ b/apps/roam/src/components/settings/AdminPanel.tsx
@@ -14,7 +14,6 @@ import {
 } from "@blueprintjs/core";
 import Description from "roamjs-components/components/Description";
 import { Select } from "@blueprintjs/select";
-import { getSetting, setSetting } from "~/utils/extensionSettings";
 import {
   getSupabaseContext,
   getLoggedInClient,
@@ -27,8 +26,6 @@ import {
   type NodeSignature,
   type PConceptFull,
 } from "@repo/database/lib/queries";
-import migrateRelations from "~/utils/migrateRelations";
-import { countReifiedRelations } from "~/utils/createReifiedBlock";
 import type { DGSupabaseClient } from "@repo/database/lib/client";
 import internalError from "~/utils/internalError";
 import SuggestiveModeSettings from "./SuggestiveModeSettings";
@@ -36,8 +33,6 @@ import { getFormattedConfigTree } from "~/utils/discourseConfigRef";
 import refreshConfigTree from "~/utils/refreshConfigTree";
 import createBlock from "roamjs-components/writes/createBlock";
 import deleteBlock from "roamjs-components/writes/deleteBlock";
-import { USE_REIFIED_RELATIONS } from "~/data/userSettings";
-import posthog from "posthog-js";
 import { setFeatureFlag } from "~/components/settings/utils/accessors";
 
 const NodeRow = ({ node }: { node: PConceptFull }) => {
@@ -258,98 +253,7 @@ const NodeListTab = (): React.ReactElement => {
   );
 };
 
-const MigrationTab = (): React.ReactElement => {
-  let initial = true;
-  const [useMigrationResults, setMigrationResults] = useState<string>("");
-  const [useOngoing, setOngoing] = useState<boolean>(false);
-  const [useDryRun, setDryRun] = useState<boolean>(false);
-  const enabled = getSetting<boolean>(USE_REIFIED_RELATIONS, false);
-  const doMigrateRelations = async () => {
-    setOngoing(true);
-    try {
-      posthog.capture("Reified Relations: Migration Started", {
-        dryRun: useDryRun,
-      });
-      const before = await countReifiedRelations();
-      const numProcessed = await migrateRelations(useDryRun);
-      const after = await countReifiedRelations();
-      if (after - before < numProcessed)
-        setMigrationResults(
-          `${after - before} new relations created out of ${numProcessed} distinct relations processed`,
-        );
-      else setMigrationResults(`${numProcessed} new relations created`);
-      posthog.capture("Reified Relations: Migration Completed", {
-        dryRun: useDryRun,
-        processed: numProcessed,
-        before,
-        after,
-        created: after - before,
-      });
-    } catch (e) {
-      console.error("Relation migration failed", e);
-      setMigrationResults(
-        `Migration failed: ${(e as Error).message ?? "see console for details"}`,
-      );
-      posthog.capture("Reified Relations: Migration Failed", {
-        dryRun: useDryRun,
-        error: (e as Error).message ?? "unknown error",
-      });
-    } finally {
-      setOngoing(false);
-    }
-  };
-  useEffect(() => {
-    void (async () => {
-      if (initial) {
-        const numRelations = await countReifiedRelations();
-        setMigrationResults(
-          numRelations > 0
-            ? `${numRelations} already migrated`
-            : "No migrated relations",
-        );
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-        initial = false;
-      }
-    })();
-    return () => {
-      initial;
-    };
-  }, []);
-
-  return (
-    <>
-      <p>
-        <Button
-          className="p-4"
-          onClick={() => {
-            void doMigrateRelations();
-          }}
-          disabled={!enabled || useOngoing}
-          text="Migrate all relations"
-        ></Button>
-        <Checkbox
-          className="left-6 inline-block"
-          defaultChecked={useDryRun}
-          onChange={(e) => {
-            const target = e.target as HTMLInputElement;
-            setDryRun(target.checked);
-          }}
-          labelElement={<>Dry run</>}
-        />
-      </p>
-      {useOngoing ? (
-        <Spinner />
-      ) : (
-        <p id="migrationResultsLabel">{useMigrationResults}</p>
-      )}
-    </>
-  );
-};
-
 const FeatureFlagsTab = (): React.ReactElement => {
-  const [useReifiedRelations, setUseReifiedRelations] = useState<boolean>(
-    getSetting<boolean>(USE_REIFIED_RELATIONS, false),
-  );
   const settings = useMemo(() => {
     refreshConfigTree();
     return getFormattedConfigTree();
@@ -442,31 +346,6 @@ const FeatureFlagsTab = (): React.ReactElement => {
         </p>
       </Alert>
 
-      <Checkbox
-        defaultChecked={useReifiedRelations}
-        onChange={(e) => {
-          const target = e.target as HTMLInputElement;
-          setUseReifiedRelations(target.checked);
-          void setSetting(USE_REIFIED_RELATIONS, target.checked).catch(
-            () => undefined,
-          );
-          setFeatureFlag("Reified relation triples", target.checked);
-          posthog.capture("Reified Relations: Toggled", {
-            enabled: target.checked,
-          });
-        }}
-        labelElement={
-          <>
-            Reified relation triples
-            <Description
-              description={
-                "When ON, relations are read/written as reifiedRelationUid in [[roam/js/discourse-graph/relations]]."
-              }
-            />
-          </>
-        }
-      />
-
       <Button
         className="w-96"
         icon="send-message"
@@ -508,15 +387,6 @@ const AdminPanel = (): React.ReactElement => {
           </div>
         }
       />
-      <Tab
-        id="migration"
-        title="Migration"
-        panel={
-          <div className="flex flex-col gap-4 p-1">
-            <MigrationTab />
-          </div>
-        }
-      />
       <Tab
         id="node-list"
         title="Node list"
diff --git a/apps/roam/src/components/settings/HomePersonalSettings.tsx b/apps/roam/src/components/settings/HomePersonalSettings.tsx
index f4d2c74a3..9f31ce212 100644
--- a/apps/roam/src/components/settings/HomePersonalSettings.tsx
+++ b/apps/roam/src/components/settings/HomePersonalSettings.tsx
@@ -1,6 +1,7 @@
-import React, { useMemo } from "react";
+import React, { useMemo, useState, useRef } from "react";
 import { OnloadArgs } from "roamjs-components/types";
-import { Label } from "@blueprintjs/core";
+import { render as renderToast } from "roamjs-components/components/Toast";
+import { Label, Dialog, Button, Intent } from "@blueprintjs/core";
 import Description from "roamjs-components/components/Description";
 import { addStyle } from "roamjs-components/dom";
 import { NodeMenuTriggerComponent } from "~/components/DiscourseNodeMenu";
@@ -21,6 +22,7 @@ import {
   DISCOURSE_CONTEXT_OVERLAY_IN_CANVAS_KEY,
   STREAMLINE_STYLING_KEY,
   DISALLOW_DIAGNOSTICS,
+  USE_REIFIED_RELATIONS,
 } from "~/data/userSettings";
 import { getSetting, setSetting } from "~/utils/extensionSettings";
 import { enablePostHog, disablePostHog } from "~/utils/posthog";
@@ -28,13 +30,87 @@ import KeyboardShortcutInput from "./KeyboardShortcutInput";
 import streamlineStyling from "~/styles/streamlineStyling";
 import { getFormattedConfigTree } from "~/utils/discourseConfigRef";
 import { PersonalFlagPanel } from "./components/BlockPropSettingPanels";
+import migrateRelations from "~/utils/migrateRelations";
+import { countReifiedRelations } from "~/utils/createReifiedBlock";
 import posthog from "posthog-js";
+import internalError from "~/utils/internalError";
+
+const enum RelationMigrationDialog {
+  "none",
+  "activate",
+  "deactivate",
+  "reactivate",
+}
 
 const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
   const extensionAPI = onloadArgs.extensionAPI;
   const overlayHandler = getOverlayHandler(onloadArgs);
   const settings = useMemo(() => getFormattedConfigTree(), []);
-
+  const [activeRelationMigration, setActiveRelationMigration] =
+    useState<RelationMigrationDialog>(RelationMigrationDialog.none);
+  const [numExistingRelations, setNumExistingRelations] = useState<number>(0);
+  const [isOngoing, setOngoing] = useState<boolean>(false);
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const settingStoredMigrationValue = useRef<boolean>();
+  const setStoredRelations = async (enabled: boolean) => {
+    await setSetting(USE_REIFIED_RELATIONS, enabled);
+    const panel = document.getElementById("stored-relation-flag");
+    const checkboxList = panel?.getElementsByTagName("input");
+    if (checkboxList && checkboxList.length > 0) {
+      const checkbox = checkboxList.item(0)!;
+      if (checkbox.checked !== enabled) {
+        settingStoredMigrationValue.current = true;
+        checkbox.click();
+        settingStoredMigrationValue.current = false;
+      }
+    }
+  };
+  const startMigration = async (): Promise<void> => {
+    const before = numExistingRelations;
+    try {
+      posthog.capture("Reified Relations: Migration Started");
+      const numProcessed = await migrateRelations();
+      if (numProcessed === false) {
+        renderToast({
+          content: "Reified Relations: Migration Failed",
+          intent: Intent.DANGER,
+          id: "migration-error",
+        });
+        await setStoredRelations(false);
+        return;
+      }
+      const after = await countReifiedRelations();
+      setNumExistingRelations(after);
+      if (before)
+        renderToast({
+          content: `${after - before} new relations created out of ${numProcessed} distinct relations processed`,
+          intent: Intent.SUCCESS,
+          id: "re-migration-success",
+        });
+      else
+        renderToast({
+          content: `${after} new relations created`,
+          intent: Intent.SUCCESS,
+          id: "migration-success",
+        });
+      posthog.capture("Reified Relations: Migration Completed", {
+        processed: numProcessed,
+        before,
+        after,
+        created: after - before,
+      });
+      await setStoredRelations(true);
+    } catch (error) {
+      internalError({
+        error,
+        userMessage: "Reified Relations: Migration Failed",
+      });
+      await setStoredRelations(false);
+    } finally {
+      setOngoing(false);
+      setActiveRelationMigration(RelationMigrationDialog.none);
+    }
+  };
   return (
     <div className="flex flex-col gap-4 p-1">
       <Label>
@@ -90,6 +166,37 @@ const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
           }}
         />
       )}
+
+      <div id="stored-relation-flag">
+        <PersonalFlagPanel
+          title="Enable stored relations"
+          description="Transition to using stored relations instead of pattern-based relations"
+          settingKeys={["Reified relation triples"]}
+          initialValue={getSetting<boolean>(USE_REIFIED_RELATIONS, false)}
+          // eslint-disable-next-line @typescript-eslint/require-await
+          onBeforeChange={async (checked) => {
+            if (settingStoredMigrationValue.current) return true;
+            if (checked) {
+              countReifiedRelations()
+                .then((num: number) => {
+                  setNumExistingRelations(num);
+                  setActiveRelationMigration(
+                    num > 0
+                      ? RelationMigrationDialog.reactivate
+                      : RelationMigrationDialog.activate,
+                  );
+                })
+                .catch((error) => {
+                  internalError({ error });
+                });
+            } else {
+              setActiveRelationMigration(RelationMigrationDialog.deactivate);
+            }
+            return false;
+          }}
+        />
+      </div>
+
       <PersonalFlagPanel
         title="Text selection popup"
         description="Whether or not to show the discourse node menu when selecting text."
@@ -186,6 +293,153 @@ const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
           }
         }}
       />
+      <Dialog
+        isOpen={activeRelationMigration === RelationMigrationDialog.reactivate}
+        onClose={() => {
+          setActiveRelationMigration(RelationMigrationDialog.none);
+        }}
+      >
+        <div className="p-4">
+          {isOngoing ? (
+            <p>Migrating relations, please wait</p>
+          ) : (
+            <div>
+              <p>
+                Activating the faster relations system will migrate all
+                previously created relations and newly created relations will
+                use the new system. You can deactivate this setting to revert to
+                the old system, and your newly created relations will not be
+                deleted; however, they will not be accessible until you
+                reactivate the faster relation system.
+              </p>
+              <p>
+                <Label>Relations</Label> {numExistingRelations}
+              </p>
+              <div className="flex items-center gap-2">
+                <Button
+                  small
+                  onClick={() => {
+                    setActiveRelationMigration(RelationMigrationDialog.none);
+                  }}
+                >
+                  Cancel
+                </Button>
+                <Button
+                  small
+                  intent={Intent.PRIMARY}
+                  onClick={() => {
+                    setStoredRelations(true)
+                      .then(() => {
+                        setActiveRelationMigration(
+                          RelationMigrationDialog.none,
+                        );
+                      })
+                      .catch((error) => {
+                        internalError({ error });
+                      });
+                  }}
+                >
+                  Reactivate without Migration
+                </Button>
+                <Button
+                  small
+                  intent={Intent.PRIMARY}
+                  onClick={() => {
+                    setOngoing(true);
+                    void startMigration();
+                  }}
+                >
+                  Migrate again and Reactivate
+                </Button>
+              </div>
+            </div>
+          )}
+        </div>
+      </Dialog>
+      <Dialog
+        isOpen={activeRelationMigration === RelationMigrationDialog.deactivate}
+        onClose={() => {
+          setActiveRelationMigration(RelationMigrationDialog.none);
+        }}
+      >
+        <div className="p-4">
+          <p>
+            Deactivating the faster relations system will mean that any
+            relations created using it will no longer be accessible. The
+            discourse context overlay will still be usable with the previous
+            relations system. Any relations created with the faster system will
+            be accessible should you choose to reactivate.
+          </p>
+          <div className="flex items-center gap-2">
+            <Button
+              small
+              onClick={() => {
+                setActiveRelationMigration(RelationMigrationDialog.none);
+              }}
+            >
+              Cancel
+            </Button>
+            <Button
+              small
+              intent={Intent.DANGER}
+              onClick={() => {
+                setStoredRelations(false)
+                  .then(() => {
+                    setActiveRelationMigration(RelationMigrationDialog.none);
+                  })
+                  .catch((error) => {
+                    internalError({ error });
+                  });
+              }}
+            >
+              Deactivate
+            </Button>
+          </div>
+        </div>
+      </Dialog>
+      <Dialog
+        isOpen={activeRelationMigration === RelationMigrationDialog.activate}
+        onClose={() => {
+          setActiveRelationMigration(RelationMigrationDialog.none);
+        }}
+      >
+        <div className="p-4">
+          {isOngoing ? (
+            <p>Migrating relations, please wait</p>
+          ) : (
+            <div>
+              <p>
+                Activating the stored relations system will migrate all
+                previously created relations and newly created relations will
+                use the new system. You can deactivate this setting to revert to
+                the old system, and your newly created relations will not be
+                deleted; however, they will not be accessible until you
+                reactivate the stored relation system.
+              </p>
+              <div className="flex items-center gap-2">
+                <Button
+                  small
+                  onClick={() => {
+                    setActiveRelationMigration(RelationMigrationDialog.none);
+                  }}
+                >
+                  Cancel
+                </Button>
+                <Button
+                  small
+                  intent={Intent.PRIMARY}
+                  onClick={() => {
+                    setOngoing(true);
+                    void startMigration();
+                  }}
+                >
+                  Activate and Migrate
+                </Button>
+              </div>
+            </div>
+          )}
+        </div>
+      </Dialog>
     </div>
   );
 };
diff --git a/apps/roam/src/components/settings/utils/zodSchema.example.ts b/apps/roam/src/components/settings/utils/zodSchema.example.ts
index f413d26e2..e71c73ef4 100644
--- a/apps/roam/src/components/settings/utils/zodSchema.example.ts
+++ b/apps/roam/src/components/settings/utils/zodSchema.example.ts
@@ -89,13 +89,11 @@ const discourseNodeSettings: DiscourseNodeSettings = {
 const featureFlags: FeatureFlags = {
   "Enable left sidebar": true,
   "Suggestive mode enabled": true,
-  "Reified relation triples": false,
 };
 
 const defaultFeatureFlags: FeatureFlags = {
   "Enable left sidebar": false,
   "Suggestive mode enabled": false,
-  "Reified relation triples": false,
 };
 
 const exportSettings: ExportSettings = {
@@ -373,6 +371,7 @@ const personalSettings: PersonalSettings = {
   "Streamline styling": true,
   "Auto canvas relations": true,
   "Disable product diagnostics": false,
+  "Reified relation triples": true,
   Query: {
     "Hide query metadata": true,
     "Default page size": 25,
@@ -401,6 +400,7 @@ const defaultPersonalSettings: PersonalSettings = {
   "Streamline styling": false,
   "Auto canvas relations": false,
   "Disable product diagnostics": false,
+  "Reified relation triples": false,
   Query: {
     "Hide query metadata": false,
     "Default page size": 10,
diff --git a/apps/roam/src/components/settings/utils/zodSchema.ts b/apps/roam/src/components/settings/utils/zodSchema.ts
index 378020d42..60ec5f331 100644
--- a/apps/roam/src/components/settings/utils/zodSchema.ts
+++ b/apps/roam/src/components/settings/utils/zodSchema.ts
@@ -156,7 +156,6 @@ export const DiscourseRelationSchema = z.object({
 export const FeatureFlagsSchema = z.object({
   "Enable left sidebar": z.boolean().default(false),
   "Suggestive mode enabled": z.boolean().default(false),
-  "Reified relation triples": z.boolean().default(false),
 });
 
 export const ExportSettingsSchema = z.object({
@@ -248,6 +247,7 @@ export const PersonalSettingsSchema = z.object({
     .object({ modifiers: z.number(), key: z.string() })
     .default({ modifiers: 0, key: "" }),
   "Discourse context overlay": z.boolean().default(false),
+  "Reified relation triples": z.boolean().default(false),
   "Suggestive mode overlay": z.boolean().default(false),
   "Overlay in canvas": z.boolean().default(false),
   "Text selection popup": z.boolean().default(true),
diff --git a/apps/roam/src/utils/migrateRelations.ts b/apps/roam/src/utils/migrateRelations.ts
index 41cba8014..3f4ecb027 100644
--- a/apps/roam/src/utils/migrateRelations.ts
+++ b/apps/roam/src/utils/migrateRelations.ts
@@ -4,6 +4,7 @@ import type { json } from "./getBlockProps";
 import setBlockProps from "./setBlockProps";
 import { getSetting, setSetting } from "./extensionSettings";
 import { USE_REIFIED_RELATIONS } from "~/data/userSettings";
+import internalError from "./internalError";
 import {
   createReifiedRelation,
   DISCOURSE_GRAPH_PROP_NAME,
@@ -11,11 +12,9 @@ import {
 
 const MIGRATION_PROP_NAME = "relation-migration";
 
-const migrateRelations = async (dryRun = false): Promise<number> => {
-  const authorized = getSetting<boolean>(USE_REIFIED_RELATIONS, false);
-  if (!authorized) return 0;
+const migrateRelations = async (): Promise<number | false> => {
   let numProcessed = 0;
-  await setSetting(USE_REIFIED_RELATIONS, false); // so queries use patterns
+  let didError = false;
   // wait for the settings to propagate
   await new Promise((resolve) => setTimeout(resolve, 150));
   try {
@@ -25,49 +24,47 @@ const migrateRelations = async (dryRun = false): Promise<number> => {
       const key = `${rel.source}:${rel.relUid}:${rel.target}`;
       if (processed.has(key)) continue;
       processed.add(key);
-      if (!dryRun) {
-        const uid = (await createReifiedRelation({
-          sourceUid: rel.source,
-          destinationUid: rel.target,
-          relationBlockUid: rel.relUid,
-        }))!;
-        const sourceProps = getBlockProps(rel.source);
-        const dgDataOrig = sourceProps[DISCOURSE_GRAPH_PROP_NAME];
-        const dgData: Record<string, json> =
-          dgDataOrig !== null &&
-          typeof dgDataOrig === "object" &&
-          !Array.isArray(dgDataOrig)
-            ? dgDataOrig
-            : {};
-        const migrationDataOrig = dgData[MIGRATION_PROP_NAME];
-        let migrationData: Record<string, json> =
-          migrationDataOrig !== null &&
-          typeof migrationDataOrig === "object" &&
-          !Array.isArray(migrationDataOrig)
-            ? migrationDataOrig
-            : {};
-        if (migrationData[uid] !== undefined) {
-          console.debug(`reprocessed ${key}`);
-        }
-        // clean up old migration entries
-        migrationData = Object.fromEntries(
-          Object.entries(migrationData).filter(
-            ([uid]) =>
-              window.roamAlphaAPI.q(
-                `[:find ?p :where [?p :block/uid "${uid}"]]`,
-              ).length > 0,
-          ),
-        );
-        migrationData[uid] = new Date().valueOf();
-        dgData[MIGRATION_PROP_NAME] = migrationData;
-        setBlockProps(rel.source, { [DISCOURSE_GRAPH_PROP_NAME]: dgData });
+      const uid = (await createReifiedRelation({
+        sourceUid: rel.source,
+        destinationUid: rel.target,
+        relationBlockUid: rel.relUid,
+      }))!;
+      const sourceProps = getBlockProps(rel.source);
+      const dgDataOrig = sourceProps[DISCOURSE_GRAPH_PROP_NAME];
+      const dgData: Record<string, json> =
+        dgDataOrig !== null &&
+        typeof dgDataOrig === "object" &&
+        !Array.isArray(dgDataOrig)
+          ? dgDataOrig
+          : {};
+      const migrationDataOrig = dgData[MIGRATION_PROP_NAME];
+      let migrationData: Record<string, json> =
+        migrationDataOrig !== null &&
+        typeof migrationDataOrig === "object" &&
+        !Array.isArray(migrationDataOrig)
+          ? migrationDataOrig
+          : {};
+      if (migrationData[uid] !== undefined) {
+        console.debug(`reprocessed ${key}`);
       }
+      // clean up old migration entries
+      migrationData = Object.fromEntries(
+        Object.entries(migrationData).filter(
+          ([uid]) =>
+            window.roamAlphaAPI.q(`[:find ?p :where [?p :block/uid "${uid}"]]`)
+              .length > 0,
+        ),
+      );
+      migrationData[uid] = new Date().valueOf();
+      dgData[MIGRATION_PROP_NAME] = migrationData;
+      setBlockProps(rel.source, { [DISCOURSE_GRAPH_PROP_NAME]: dgData });
       numProcessed++;
     }
-  } finally {
-    await setSetting(USE_REIFIED_RELATIONS, true);
+  } catch (error) {
+    internalError({ error });
+    didError = true;
   }
-  return numProcessed;
+  return didError ? false : numProcessed;
 };
 
 export default migrateRelations;