diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po
index 98f80b85..723efdd3 100644
--- a/resources/language/resource.language.en_gb/strings.po
+++ b/resources/language/resource.language.en_gb/strings.po
@@ -905,3 +905,11 @@ msgstr ""
 msgctxt "#33184"
 msgid "Remove libraries"
 msgstr ""
+
+msgctxt "#33185"
+msgid "Enable sync during playback (may cause some lag)"
+msgstr ""
+
+msgctxt "#33186"
+msgid "The Kodi companion speeds up the start up sync. Other syncs are triggered by server events."
+msgstr ""
diff --git a/resources/lib/library.py b/resources/lib/library.py
index 2353bbd4..8834fe9d 100644
--- a/resources/lib/library.py
+++ b/resources/lib/library.py
@@ -129,17 +129,19 @@ class Library(threading.Thread):
                 if thread.is_done:
                     threads.remove(thread)
 
-        self.worker_downloads()
-        self.worker_sort()
+        if (self.player.isPlayingVideo() and settings('syncDuringPlay.bool')) or xbmc.getCondVisibility('VideoPlayer.Content(livetv)'):
 
-        self.worker_updates()
-        self.worker_userdata()
-        self.worker_remove()
-        self.worker_notify()
+            self.worker_downloads()
+            self.worker_sort()
+
+            self.worker_updates()
+            self.worker_userdata()
+            self.worker_remove()
+            self.worker_notify()
 
         if self.pending_refresh:
 
-            if self.total_updates > self.progress_display and (not self.player.isPlayingVideo() or xbmc.getCondVisibility('VideoPlayer.Content(livetv)')):
+            if self.total_updates > self.progress_display:
                 queue_size = self.worker_queue_size()
 
                 if self.progress_updates is None:
diff --git a/resources/settings.xml b/resources/settings.xml
index 6bd42c2b..657a44aa 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -19,8 +19,10 @@
 	</category>
 
 	<category label="30506"><!-- Sync Options -->
+		<setting label="33186" type="lsep" />
 		<setting label="33137" id="kodiCompanion" type="bool" default="true" />
 		<setting label="30507" id="syncIndicator" type="number" default="99" visible="eq(-1,true)" subsetting="true"/>
+		<setting label="33185" id="syncDuringPlay" type="bool" default="true" />
 		<setting label="30536" id="dbSyncScreensaver" type="bool" default="true" />
 		<setting label="33111" type="lsep" />
 		<setting label="30511" id="useDirectPaths" type="enum" lvalues="33036|33037" default="1" />