diff --git a/README.md b/README.md
index a86be5bc..b843b409 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-[![stable version](https://img.shields.io/badge/stable_version-2.11.5-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.5-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.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)
 
 [![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 40cf085c..8bb3d286 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.5" provider-name="croneter">
+<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.11.6" provider-name="croneter">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.requests" version="2.9.1" />
@@ -83,7 +83,11 @@
     <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.5:
+    <news>version 2.11.6:
+- Fix rare sync crash when queue was full
+- Set "Auto-adjust transcoding quality" to false by default
+
+version 2.11.5:
 - Versions 2.11.0-2.11.4 for everyone
 
 version 2.11.4 (beta only):
diff --git a/changelog.txt b/changelog.txt
index 819508dd..17adb89b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+version 2.11.6:
+- Fix rare sync crash when queue was full
+- Set "Auto-adjust transcoding quality" to false by default
+
 version 2.11.5:
 - Versions 2.11.0-2.11.4 for everyone
 
diff --git a/resources/lib/library_sync/fill_metadata_queue.py b/resources/lib/library_sync/fill_metadata_queue.py
index 37e8eef0..d4f5a00e 100644
--- a/resources/lib/library_sync/fill_metadata_queue.py
+++ b/resources/lib/library_sync/fill_metadata_queue.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
-from Queue import Empty
+from Queue import Full
 
 from . import common, sections
 from ..plex_db import PlexDB
@@ -9,7 +9,7 @@ from .. import backgroundthread
 
 LOG = getLogger('PLEX.sync.fill_metadata_queue')
 
-QUEUE_TIMEOUT = 10  # seconds
+QUEUE_TIMEOUT = 60  # seconds
 
 
 class FillMetadataQueue(common.LibrarySyncMixin,
@@ -49,7 +49,7 @@ class FillMetadataQueue(common.LibrarySyncMixin,
                 try:
                     self.get_metadata_queue.put((count, plex_id, section),
                                                 timeout=QUEUE_TIMEOUT)
-                except Empty:
+                except Full:
                     LOG.error('Putting %s in get_metadata_queue timed out - '
                               'aborting sync now', plex_id)
                     section.sync_successful = False
diff --git a/resources/settings.xml b/resources/settings.xml
index 61ff23e6..6e3de284 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -112,7 +112,7 @@
         <setting type="sep" />
         <setting id="playType" type="enum" label="30002" values="Try Direct Path|Direct Play|Direct Stream|Force Transcode" default="0" />
         <setting id="transcoderVideoQualities" type="enum" label="30160" values="420x420, 320kbps|576x320, 720kbps|720x480, 1.5Mbps|1024x768, 2Mbps|720p, 3Mbps|720p, 4Mbps|1080p, 8Mbps|1080p, 10Mbps|1080p, 12Mbps|1080p, 20Mbps|1080p, 40Mbps|4K, 35Mbps|4K, 50Mbps" default="10" /><!-- Video Quality if Transcoding necessary -->
-        <setting id="auto_adjust_transcode_quality" label="30161" type="bool" default="true" /><!-- Auto-adjust transcoding quality (deactivate for Chromecast) -->
+        <setting id="auto_adjust_transcode_quality" label="30161" type="bool" default="false" /><!-- Auto-adjust transcoding quality (deactivate for Chromecast) -->
         <setting id="maxVideoQualities" type="enum" label="30143" values="320kbps|720kbps|1.5Mbps|2Mbps|3Mbps|4Mbps|8Mbps|10Mbps|12Mbps|20Mbps|40Mbps|deactivated" default="11" /><!-- Always transcode if video bitrate is above -->
         <setting id="transcodeH265" type="enum" label="30522" default="0" values="Disabled (default)|480p (and higher)|720p (and higher)|1080p (and higher)|4K" /><!-- Force transcode h265/HEVC -->
         <setting id="transcodeHi10P" type="bool" label="39063" default="false"/>