diff --git a/README.md b/README.md
index b843b409..1eda12b5 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-[![stable version](https://img.shields.io/badge/stable_version-2.11.6-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.11.6-red.svg?maxAge=60&style=flat) ](https://github.com/croneter/binary_repo/raw/master/beta/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-1.0.2.zip)
+[![stable version](https://img.shields.io/badge/stable_version-2.11.7-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.11.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 8bb3d286..12bcf93f 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.11.6" provider-name="croneter">
+<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.11.7" provider-name="croneter">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.requests" version="2.9.1" />
@@ -83,7 +83,10 @@
     <summary lang="lt_LT">Natūralioji „Plex“ integracija į „Kodi“</summary>
     <description lang="lt_LT">Prijunkite „Kodi“ prie „Plex Medija Serverio“. Šiame papildinyje daroma prielaida, kad valdote visus savo vaizdo įrašus naudodami „Plex“ (ir nė vieno su „Kodi“). Galite prarasti jau saugomus „Kodi“ vaizdo įrašų ir muzikos duomenų bazių duomenis (kadangi šis papildinys juos tiesiogiai pakeičia). Naudokite savo pačių rizika!</description>
     <disclaimer lang="lt_LT">Naudokite savo pačių rizika</disclaimer>
-    <news>version 2.11.6:
+    <news>version 2.11.7:
+- Fix PKC crashing on devices running Microsoft UWP, e.g. XBox
+
+version 2.11.6:
 - Fix rare sync crash when queue was full
 - Set "Auto-adjust transcoding quality" to false by default
 
diff --git a/changelog.txt b/changelog.txt
index 17adb89b..7f5149e0 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,6 @@
+version 2.11.7:
+- Fix PKC crashing on devices running Microsoft UWP, e.g. XBox
+
 version 2.11.6:
 - Fix rare sync crash when queue was full
 - Set "Auto-adjust transcoding quality" to false by default
diff --git a/resources/lib/utils.py b/resources/lib/utils.py
index 2da4a378..72127168 100644
--- a/resources/lib/utils.py
+++ b/resources/lib/utils.py
@@ -542,11 +542,12 @@ def wipe_database(reboot=True):
     """
     LOG.warn('Start wiping')
     from .library_sync.sections import delete_files
+    from .library_sync.common import PLAYLIST_SYNC_ENABLED
     from . import kodi_db, plex_db
-    from .playlists import remove_synced_playlists
-    # Clean up the playlists and video nodes
     delete_files()
-    remove_synced_playlists()
+    if PLAYLIST_SYNC_ENABLED:
+        from .playlists import remove_synced_playlists
+        remove_synced_playlists()
     try:
         with plex_db.PlexDB() as plexdb:
             if plexdb.songs_have_been_synced():