diff --git a/src/Application.cpp b/src/Application.cpp
index 96debe36b..cb81a4d18 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -80,7 +80,10 @@ void Application::initialize(Settings &settings, Paths &paths)
     assert(isAppInitialized == false);
     isAppInitialized = true;
 
-    //Irc::getInstance().load();
+    if (getSettings()->enableExperimentalIrc)
+    {
+        Irc::getInstance().load();
+    }
 
     for (auto &singleton : this->singletons_)
     {
diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp
index 79b3430ea..e6da2c291 100644
--- a/src/singletons/Settings.hpp
+++ b/src/singletons/Settings.hpp
@@ -213,7 +213,7 @@ public:
     BoolSetting openLinksIncognito = {"/misc/openLinksIncognito", 0};
 
     QStringSetting cachePath = {"/cache/path", ""};
-    BoolSetting restartOnCrash = {"/misc/restartOnCrash", true};
+    BoolSetting restartOnCrash = {"/misc/restartOnCrash", false};
 
     /// Debug
     BoolSetting showUnhandledIrcMessages = {"/debug/showUnhandledIrcMessages",