diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po
index e2792b56..409ca00a 100644
--- a/resources/language/resource.language.en_gb/strings.po
+++ b/resources/language/resource.language.en_gb/strings.po
@@ -230,6 +230,10 @@ msgctxt "#30506"
 msgid "Sync"
 msgstr ""
 
+msgctxt "#30507"
+msgid "Enable notification if update count is greater than"
+msgstr ""
+
 msgctxt "#30508"
 msgid "Sync empty shows"
 msgstr ""
@@ -837,3 +841,7 @@ msgstr ""
 msgctxt "#33171"
 msgid "A-Z"
 msgstr ""
+
+msgctxt "#33172"
+msgid "You have {number} updates pending. This may take a little while before seeing new content. It might be faster to update your libraries via launching the Emby add-on > update libraries. Proceed anyway?"
+msgstr ""
diff --git a/resources/lib/library.py b/resources/lib/library.py
index 59414be7..c44ba115 100644
--- a/resources/lib/library.py
+++ b/resources/lib/library.py
@@ -264,12 +264,29 @@ class Library(threading.Thread):
             [self.updated_output[query['Type']].put(query) for query in data['Items']]
         """
         try:
+            updated = []
+            userdata = []
+            removed = []
+
             for media in filters:
                 result = self.server['api'].get_sync_queue(last_sync, ",".join([x for x in filters if x != media]))
-                self.updated(result['ItemsAdded'])
-                self.updated(result['ItemsUpdated'])
-                self.userdata(result['UserDataChanged'])
-                self.removed(result['ItemsRemoved'])
+                updated.extend(result['ItemsAdded'])
+                updated.extend(result['ItemsUpdated'])
+                userdata.extend(result['UserDataChanged'])
+                removed.extend(result['ItemsRemoved'])
+
+            total = len(updated) + len(userdata)
+
+            if total > int(settings('incSyncIndicator') or 99):
+
+                if not dialog("yesno", heading="{emby}", line1=_(33172).replace('{number}', str(total))):
+                    LOG.warn("Large updates skipped.")
+
+                    return True
+
+            self.updated(updated)
+            self.userdata(userdata)
+            self.removed(removed)
 
             """
             result = self.server['api'].get_sync_queue(last_sync)
diff --git a/resources/settings.xml b/resources/settings.xml
index 0485dd84..a0c0319f 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -20,6 +20,7 @@
 
 	<category label="30506"><!-- Sync Options -->
 		<setting label="33137" id="kodiCompanion" type="bool" default="true" />
+		<setting label="30507" id="incSyncIndicator" type="number" default="99" visible="eq(-1,true)" subsetting="true"/>
 		<setting label="33111" type="lsep" />
 		<setting label="30511" id="useDirectPaths" type="enum" lvalues="33036|33037" default="1" />