diff --git a/panel/src/pages/Settings.tsx b/panel/src/pages/Settings.tsx
index af2c5b2..d968854 100644
--- a/panel/src/pages/Settings.tsx
+++ b/panel/src/pages/Settings.tsx
@@ -20,7 +20,6 @@ import {
   useSettings,
   type GameSettings,
   type GuildSettings,
-  type SettingsMeta,
 } from "../lib/useSettings";
 import {
   GuildSection,
@@ -107,14 +106,14 @@ export default function Settings() {
   }, [settings, gameDraft]);
 
   useEffect(() => {
-    if (!guildDraft) {
+    if (!guildDraft && !loading) {
       setGuildDraft(
         guildSettings
           ? structuredClone(guildSettings)
           : { ...defaultGuildSettings, guildId: meta?.guildId ?? "" }
       );
     }
-  }, [guildSettings, guildDraft, meta?.guildId]);
+  }, [guildSettings, guildDraft, meta?.guildId, loading]);
 
   const isGuildTab = activeSection === "guild";