diff --git a/src/scanmanager.cpp b/src/scanmanager.cpp
index f7eced35c..ce1589b0c 100644
--- a/src/scanmanager.cpp
+++ b/src/scanmanager.cpp
@@ -117,7 +117,9 @@ void
 ScanManager::scanTimerTimeout()
 {
     qDebug() << Q_FUNC_INFO;
-    if ( !Database::instance() || ( Database::instance() && !Database::instance()->isReady() ) )
+    if ( !TomahawkSettings::instance()->watchForChanges() ||
+         !Database::instance() ||
+         ( Database::instance() && !Database::instance()->isReady() ) )
         return;
     else
         runScan();