diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po
index 2f70ff9f..75c05b36 100644
--- a/resources/language/resource.language.en_gb/strings.po
+++ b/resources/language/resource.language.en_gb/strings.po
@@ -820,6 +820,11 @@ msgctxt "#39035"
 msgid "Replace Plex paths /volume1/media or \\\\myserver\\media with custom SMB paths smb://NAS/mystuff"
 msgstr ""
 
+# PKC Settings - Customize Paths
+msgctxt "#39036"
+msgid "Escape special characters in path (e.g. space to %20)"
+msgstr ""
+
 # PKC Settings - Customize Paths
 msgctxt "#39037"
 msgid "Original Plex MOVIE path to replace:"
diff --git a/resources/lib/app/libsync.py b/resources/lib/app/libsync.py
index 8fad3781..51d83df8 100644
--- a/resources/lib/app/libsync.py
+++ b/resources/lib/app/libsync.py
@@ -44,6 +44,8 @@ class Sync(object):
         self.remapSMBmusicNew = utils.settings('remapSMBmusicNew')
         self.remapSMBphotoOrg = utils.settings('remapSMBphotoOrg')
         self.remapSMBphotoNew = utils.settings('remapSMBphotoNew')
+        # Escape path?
+        self.escape_path = utils.settings('escapePath') == 'true'
         # Shall we replace custom user ratings with the number of versions available?
         self.indicate_media_versions = utils.settings('indicate_media_versions') == "true"
         # Will sync movie trailer differently: either play trailer directly or show
diff --git a/resources/lib/plex_api.py b/resources/lib/plex_api.py
index e18ad7a1..8399b040 100644
--- a/resources/lib/plex_api.py
+++ b/resources/lib/plex_api.py
@@ -1743,6 +1743,8 @@ class API(object):
         elif app.SYNC.replace_smb_path is True:
             if path.startswith('\\\\'):
                 path = 'smb:' + path.replace('\\', '/')
+        if app.SYNC.escape_path:
+            path = quote(path)
         if ((app.SYNC.path_verified and force_check is False) or
                 omit_check is True):
             return path
diff --git a/resources/settings.xml b/resources/settings.xml
index e7febd0e..1f81d6e7 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -99,6 +99,7 @@
 		<setting id="remapSMBmusicNew" type="text" label="39042" default="smb://" visible="eq(-6,true)" subsetting="true" /> <!-- Replace Plex MUSIC with: -->
 		<setting id="remapSMBphotoOrg" type="text" label="39045" default="" visible="eq(-7,true)" subsetting="true" /> <!-- Original Plex MUSIC path to replace: -->
 		<setting id="remapSMBphotoNew" type="text" label="39046" default="smb://" visible="eq(-8,true)" subsetting="true" /> <!-- Replace Plex MUSIC with: -->
+        <setting id="escapePath" type="bool" label="39036" default="false" /> <!-- Escape special characters in path (e.g. space to %20) -->
 	</category>
 
 	<category label="30516"><!-- Playback -->