diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index ee753cee..51e5c48c 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -364,6 +364,7 @@
     <string id="39023">Failed to authenticate. Did you login to plex.tv?</string>
     <string id="39024">[COLOR yellow]Log into plex.tv[/COLOR]</string>
     <string id="39025">Automatically log into plex.tv on startup</string>
+    <string id="39026">Enable constant background sync (restart Kodi!)</string>
 
 
     <!-- Plex Entrypoint.py -->
diff --git a/resources/language/German/strings.xml b/resources/language/German/strings.xml
index 4c44a3af..d42cb99a 100644
--- a/resources/language/German/strings.xml
+++ b/resources/language/German/strings.xml
@@ -295,6 +295,7 @@
     <string id="39023">Plex Media Server Authentifizierung fehlgeschlagen. Haben Sie sich bei plex.tv eingeloggt?</string>
     <string id="39024">[COLOR yellow]Bei plex.tv einloggen[/COLOR]</string>
     <string id="39025">Automatisch beim Starten bei plex.tv einloggen</string>
+    <string id="39026">Laufende Synchronisierung im Hintergrund aktivieren (Neustart!)</string>
 
     <!-- Plex Entrypoint.py -->
     <string id="39200">Plex Home Benutzer wechseln</string>
diff --git a/resources/lib/librarysync.py b/resources/lib/librarysync.py
index e895f42d..2382f26c 100644
--- a/resources/lib/librarysync.py
+++ b/resources/lib/librarysync.py
@@ -225,6 +225,9 @@ class LibrarySync(Thread):
             utils.settings('dbSyncIndicator') == 'true' else False
         self.enableMusic = True if utils.settings('enableMusic') == "true" \
             else False
+        self.enableBackgroundSync = True if utils.settings(
+            'enableBackgroundSync') == "true" \
+            else False
 
         Thread.__init__(self)
 
@@ -1253,7 +1256,7 @@ class LibrarySync(Thread):
                             time=3000,
                             sound=True)
                     window('emby_dbScan', clear=True)
-                else:
+                elif self.enableBackgroundSync:
                     # Run full lib scan approx every 30min
                     if count >= 1800:
                         count = 0
diff --git a/resources/settings.xml b/resources/settings.xml
index c12a66d3..517ec5f9 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -51,6 +51,7 @@
 		<setting id="syncEmptyShows" type="bool" label="30508" default="false" visible="false"/>
 		<setting id="useDirectPaths" type="enum" label="30511" values="Addon(Default)|Native(Direct paths)" default="0" visible="false"/> <!-- Playback mode -->
 		<setting id="enableMusic" type="bool" label="30509" default="true" />
+		<setting id="enableBackgroundSync" type="bool" label="39026" default="true" visible="true"/>
 		<setting id="streamMusic" type="bool" label="30510" default="false" visible="false" subsetting="true"/> <!-- Direct stream Music library -->
 		<setting type="lsep" label="30523" visible="false"/> <!-- Music metadata options -->
         <setting id="enableImportSongRating" type="bool" label="30524" default="true" visible="false"/>