diff --git a/README.md b/README.md
index 3a8e2c8d..0ddeb8ba 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 [![stable version](https://img.shields.io/badge/stable_version-2.3.3-blue.svg?maxAge=60&style=flat) ](https://github.com/croneter/binary_repo/raw/master/stable/repository.plexkodiconnect/repository.plexkodiconnect-1.0.2.zip) 
-[![beta version](https://img.shields.io/badge/beta_version-2.3.6-red.svg?maxAge=60&style=flat) ](https://github.com/croneter/binary_repo/raw/master/beta/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-1.0.2.zip)
+[![beta version](https://img.shields.io/badge/beta_version-2.3.7-red.svg?maxAge=60&style=flat) ](https://github.com/croneter/binary_repo/raw/master/beta/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-1.0.2.zip)
 
 [![Installation](https://img.shields.io/badge/wiki-installation-brightgreen.svg?maxAge=60&style=flat)](https://github.com/croneter/PlexKodiConnect/wiki/Installation)
 [![FAQ](https://img.shields.io/badge/wiki-FAQ-brightgreen.svg?maxAge=60&style=flat)](https://github.com/croneter/PlexKodiConnect/wiki/faq)
diff --git a/addon.xml b/addon.xml
index b350b32c..ad249a1a 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.3.6" provider-name="croneter">
+<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.3.7" provider-name="croneter">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.requests" version="2.9.1" />
@@ -73,7 +73,11 @@
     <summary lang="uk_UA">Нативна інтеграція Plex в Kodi</summary>
     <description lang="uk_UA">Підключає Kodi до серверу Plex. Цей плагін передбачає, що ви керуєте всіма своїми відео за допомогою Plex (і ніяк не Kodi). Ви можете втратити дані, які вже зберігаються у відео та музичних БД Kodi (оскільки цей плагін безпосередньо їх змінює). Використовуйте на свій страх і ризик!</description>
     <disclaimer lang="uk_UA">Використовуйте на свій ризик</disclaimer>
-    <news>version 2.3.6 (beta only):
+    <news>version 2.3.7 (beta only):
+- Fix library sync crash due to exotic playlist characters
+- Force-deactivate playlist sync for Microsoft UWP for Kodi 18
+
+version 2.3.6 (beta only):
 - Fix PKC not starting by decoupling watchdog/subprocess modules
 
 version 2.3.5 (beta only):
diff --git a/changelog.txt b/changelog.txt
index 474c75e3..07442902 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+version 2.3.7 (beta only):
+- Fix library sync crash due to exotic playlist characters
+- Force-deactivate playlist sync for Microsoft UWP for Kodi 18
+
 version 2.3.6 (beta only):
 - Fix PKC not starting by decoupling watchdog/subprocess modules
 
diff --git a/resources/lib/librarysync.py b/resources/lib/librarysync.py
index f264c8ec..6187b163 100644
--- a/resources/lib/librarysync.py
+++ b/resources/lib/librarysync.py
@@ -23,7 +23,7 @@ from . import music
 from . import variables as v
 from . import state
 
-if utils.settings('enablePlaylistSync') == 'true':
+if v.PLATFORM != 'UWP' and utils.settings('enablePlaylistSync') == 'true':
     # Xbox cannot use watchdog, a dependency for PKC playlist features
     from . import playlists
     PLAYLIST_SYNC_ENABLED = True
diff --git a/resources/lib/playlists/kodi_pl.py b/resources/lib/playlists/kodi_pl.py
index 41a0c146..a2e01a20 100644
--- a/resources/lib/playlists/kodi_pl.py
+++ b/resources/lib/playlists/kodi_pl.py
@@ -115,7 +115,7 @@ def _write_playlist_to_file(playlist, xml):
             text += ('#EXTINF:%s,%s\n%s\n'
                      % (api.runtime(), api.title(), api.path()))
     text += '\n'
-    text = text.encode(v.M3U_ENCODING, 'strict')
+    text = text.encode(v.M3U_ENCODING, 'ignore')
     try:
         with open(path_ops.encode_path(playlist.kodi_path), 'wb') as f:
             f.write(text)
diff --git a/resources/lib/variables.py b/resources/lib/variables.py
index 24ae88d1..481eb242 100644
--- a/resources/lib/variables.py
+++ b/resources/lib/variables.py
@@ -48,6 +48,8 @@ KODI_PROFILE = try_decode(xbmc.translatePath("special://profile"))
 
 if xbmc.getCondVisibility('system.platform.osx'):
     PLATFORM = "MacOSX"
+elif xbmc.getCondVisibility("system.platform.uwp"):
+    PLATFORM = "Microsoft UWP"
 elif xbmc.getCondVisibility('system.platform.atv2'):
     PLATFORM = "AppleTV2"
 elif xbmc.getCondVisibility('system.platform.ios'):