diff --git a/couchpotato/core/plugins/manage/__init__.py b/couchpotato/core/plugins/manage/__init__.py
index 46eee210..912296b4 100644
--- a/couchpotato/core/plugins/manage/__init__.py
+++ b/couchpotato/core/plugins/manage/__init__.py
@@ -28,6 +28,14 @@ config = [{
                     'description': 'Remove movie from db if it can\'t be found after re-scan.',
                     'default': True,
                 },
+                {
+                    'label': 'Scan at startup',
+                    'name': 'startup_scan',
+                    'type': 'bool',
+                    'default': True,
+                    'advanced': True,
+                    'description': 'Do a quick scan on startup. On slow systems better disable this.',
+                },
             ],
         },
     ],
diff --git a/couchpotato/core/plugins/manage/main.py b/couchpotato/core/plugins/manage/main.py
index 03123a11..25831f94 100644
--- a/couchpotato/core/plugins/manage/main.py
+++ b/couchpotato/core/plugins/manage/main.py
@@ -44,7 +44,7 @@ class Manage(Plugin):
 }"""},
         })
 
-        if not Env.get('dev'):
+        if not Env.get('dev') and self.conf('startup_scan'):
             addEvent('app.load', self.updateLibraryQuick)
 
     def getProgress(self, **kwargs):