diff --git a/libnymea-core/nymeacore.cpp b/libnymea-core/nymeacore.cpp
index d68962e7..4b1f5c1b 100644
--- a/libnymea-core/nymeacore.cpp
+++ b/libnymea-core/nymeacore.cpp
@@ -174,7 +174,9 @@ NymeaCore::~NymeaCore()
                   });
 
     // Disconnect all signals/slots, we're going down now
+    m_timeManager->stopTimer();
     m_timeManager->disconnect(this);
+
     m_thingManager->disconnect(this);
     m_ruleEngine->disconnect(this);
 
diff --git a/libnymea-core/time/timemanager.cpp b/libnymea-core/time/timemanager.cpp
index fe983164..eddc9cc8 100644
--- a/libnymea-core/time/timemanager.cpp
+++ b/libnymea-core/time/timemanager.cpp
@@ -64,7 +64,7 @@ QDateTime TimeManager::currentDateTime() const
 
 /*! Stop the time.
  *
- * \note This method should only be used in tests.
+ * \note This method should only be used in tests and when shutting down the system.
 */
 void TimeManager::stopTimer()
 {