diff --git a/source/arm11/config.c b/source/arm11/config.c
index f39a5db..7c7a51b 100644
--- a/source/arm11/config.c
+++ b/source/arm11/config.c
@@ -292,9 +292,6 @@
 
 bool configSetStorageLocation(FsDevice device)
 {
-	if (!configLoaded)
-		panic();
-
 	if (device == configGetStorageLocation())
 		return false;
 
@@ -386,14 +383,16 @@
 		filepath = SdmcFilepath;
 	}
 
-	if (writeConfigFile())
+	if (configLoaded && writeConfigFile())
 	{
 		configDirty = false;
 		return true;
 	}
 	else
 	{
-		filepath = filepath_old;
+		if (configLoaded)
+			filepath = filepath_old;
+		
 		configDirty = true;
 		return false;
 	}