diff --git a/JMMServer/ServerSettings.cs b/JMMServer/ServerSettings.cs
index a884859fd..af8c93a3d 100644
--- a/JMMServer/ServerSettings.cs
+++ b/JMMServer/ServerSettings.cs
@@ -158,7 +158,8 @@ public static void LoadSettingsFromFile(string tmp_setting_file, bool delete_tmp
                     {
                         MessageBox.Show(Properties.Resources.Migration_AdminFail, Properties.Resources.Migration_Header,
                             MessageBoxButton.OK, MessageBoxImage.Information);
-                        MainWindow.Instance.ApplicationShutdown();
+	                    // This should be okay, since we are still in MainWindow Init
+                        Application.Current.Shutdown();
                         return;
                     }