diff --git a/src/core.cpp b/src/core.cpp
index 44b6c2e31..2c9f9e0c9 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -1220,6 +1220,9 @@ bool Core::loadConfiguration(QString path)
 
 void Core::saveConfiguration()
 {
+    if (!isReady())
+        return;
+
     QString dir = Settings::getSettingsDirPath();
     QDir directory(dir);
     if (!directory.exists() && !directory.mkpath(directory.absolutePath())) {
diff --git a/src/coreencryption.cpp b/src/coreencryption.cpp
index 540f4ae86..7eb238163 100644
--- a/src/coreencryption.cpp
+++ b/src/coreencryption.cpp
@@ -230,7 +230,7 @@ void Core::checkEncryptedHistory()
 
 void Core::saveConfiguration(const QString& path)
 {
-    if (!tox)
+    if (!isReady())
     {
         qWarning() << "Core::saveConfiguration: Tox not started, aborting!";
         return;