diff --git a/src/coreencryption.cpp b/src/coreencryption.cpp
index f47ada5f8..ff1eb58d4 100644
--- a/src/coreencryption.cpp
+++ b/src/coreencryption.cpp
@@ -218,6 +218,7 @@ void Core::checkEncryptedHistory()
         Widget::getInstance()->showWarningMsgBox(tr("Encrypted History"), tr("No encrypted history file found, or it was corrupted.\nHistory will be disabled!"));
         Settings::getInstance().setEncryptLogs(false);
         Settings::getInstance().setEnableLogging(false);
+        HistoryKeeper::resetInstance();
         return;
     }
 
@@ -255,6 +256,7 @@ void Core::checkEncryptedHistory()
             clearPassword(ptHistory);
             Settings::getInstance().setEncryptLogs(false);
             Settings::getInstance().setEnableLogging(false);
+            HistoryKeeper::resetInstance();
             return;
         }
         else
diff --git a/src/widget/form/settings/privacyform.cpp b/src/widget/form/settings/privacyform.cpp
index d704278e6..3582cf82d 100644
--- a/src/widget/form/settings/privacyform.cpp
+++ b/src/widget/form/settings/privacyform.cpp
@@ -55,7 +55,7 @@ void PrivacyForm::onEnableLoggingUpdated()
 {
     Settings::getInstance().setEnableLogging(bodyUI->cbKeepHistory->isChecked());
     bodyUI->cbEncryptHistory->setEnabled(bodyUI->cbKeepHistory->isChecked());
-    HistoryKeeper::getInstance()->resetInstance();
+    HistoryKeeper::resetInstance();
     Widget::getInstance()->clearAllReceipts();
 }
 
@@ -166,6 +166,7 @@ void PrivacyForm::onEncryptLogsUpdated()
     Settings::getInstance().setEncryptLogs(false);
     bodyUI->cbEncryptHistory->setChecked(false);
     bodyUI->changeLogsPwButton->setEnabled(false);
+    HistoryKeeper::resetInstance();
 }
 
 bool PrivacyForm::setToxPassword()