diff --git a/src/main/java/betterquesting/commands/admin/QuestCommandDefaults.java b/src/main/java/betterquesting/commands/admin/QuestCommandDefaults.java
index d41aeaf1a..a56e73c8e 100644
--- a/src/main/java/betterquesting/commands/admin/QuestCommandDefaults.java
+++ b/src/main/java/betterquesting/commands/admin/QuestCommandDefaults.java
@@ -98,6 +98,7 @@ public void runCommand(MinecraftServer server, CommandBase command, ICommandSend
 
                 if (loader == null) {
                     QuestSettings.INSTANCE.readFromNBT(nbt1.getCompoundTag("questSettings"));
+                    QuestSettings.INSTANCE.setProperty(NativeProps.EDIT_MODE, false);
                     QuestDatabase.INSTANCE.readFromNBT(nbt1.getTagList("questDatabase", 10), false);
                     QuestLineDatabase.INSTANCE.readFromNBT(nbt1.getTagList("questLines", 10), false);
                 } else {
diff --git a/src/main/java/betterquesting/handlers/SaveLoadHandler.java b/src/main/java/betterquesting/handlers/SaveLoadHandler.java
index a7489bd02..107ae58a6 100644
--- a/src/main/java/betterquesting/handlers/SaveLoadHandler.java
+++ b/src/main/java/betterquesting/handlers/SaveLoadHandler.java
@@ -224,6 +224,7 @@ private void loadConfig() {
             legacyLoader.readFromJson(json);
         }
 
+        QuestSettings.INSTANCE.setProperty(NativeProps.EDIT_MODE, false); // don't enable edit mode on startup
         hasUpdate = packName.equals(QuestSettings.INSTANCE.getProperty(NativeProps.PACK_NAME)) && packVer > QuestSettings.INSTANCE.getProperty(NativeProps.PACK_VER);
     }