diff --git a/resources/lib/playback.py b/resources/lib/playback.py
index dd115f0f..d187bf9c 100644
--- a/resources/lib/playback.py
+++ b/resources/lib/playback.py
@@ -57,66 +57,66 @@ def playback_triage(plex_id=None, plex_type=None, path=None, resolve=True):
         utils.dialog('notification', utils.lang(29999), utils.lang(30017))
         _ensure_resolve(abort=True)
         return
-    playqueue = PQ.get_playqueue_from_type(
-        v.KODI_PLAYLIST_TYPE_FROM_PLEX_TYPE[plex_type])
-    try:
-        pos = js.get_position(playqueue.playlistid)
-    except KeyError:
-        # Kodi bug - Playlist plays (not Playqueue) will ALWAYS be audio for
-        # add-on paths
-        LOG.info('No position returned from Kodi player! Assuming playlist')
-        playqueue = PQ.get_playqueue_from_type(v.KODI_PLAYLIST_TYPE_AUDIO)
+    with state.LOCK_PLAYQUEUES:
+        playqueue = PQ.get_playqueue_from_type(
+            v.KODI_PLAYLIST_TYPE_FROM_PLEX_TYPE[plex_type])
         try:
             pos = js.get_position(playqueue.playlistid)
         except KeyError:
-            LOG.info('Assuming video instead of audio playlist playback')
-            playqueue = PQ.get_playqueue_from_type(v.KODI_PLAYLIST_TYPE_VIDEO)
+            # Kodi bug - Playlist plays (not Playqueue) will ALWAYS be audio for
+            # add-on paths
+            LOG.info('No position returned from player! Assuming playlist')
+            playqueue = PQ.get_playqueue_from_type(v.KODI_PLAYLIST_TYPE_AUDIO)
             try:
                 pos = js.get_position(playqueue.playlistid)
             except KeyError:
-                LOG.error('Still no position - abort')
-                # "Play error"
-                utils.dialog('notification',
-                             utils.lang(29999),
-                             utils.lang(30128),
-                             icon='{error}')
-                _ensure_resolve(abort=True)
+                LOG.info('Assuming video instead of audio playlist playback')
+                playqueue = PQ.get_playqueue_from_type(v.KODI_PLAYLIST_TYPE_VIDEO)
+                try:
+                    pos = js.get_position(playqueue.playlistid)
+                except KeyError:
+                    LOG.error('Still no position - abort')
+                    # "Play error"
+                    utils.dialog('notification',
+                                 utils.lang(29999),
+                                 utils.lang(30128),
+                                 icon='{error}')
+                    _ensure_resolve(abort=True)
+                    return
+        # HACK to detect playback of playlists for add-on paths
+        items = js.playlist_get_items(playqueue.playlistid)
+        try:
+            item = items[pos]
+        except IndexError:
+            LOG.info('Could not apply playlist hack! Probably Widget playback')
+        else:
+            if ('id' not in item and
+                    item.get('type') == 'unknown' and item.get('title') == ''):
+                LOG.info('Kodi playlist play detected')
+                _playlist_playback(plex_id, plex_type)
                 return
-    # HACK to detect playback of playlists for add-on paths
-    items = js.playlist_get_items(playqueue.playlistid)
-    try:
-        item = items[pos]
-    except IndexError:
-        LOG.info('Could not apply playlist hack! Probably Widget playback')
-    else:
-        if ('id' not in item and
-                item.get('type') == 'unknown' and item.get('title') == ''):
-            LOG.info('Kodi playlist play detected')
-            _playlist_playback(plex_id, plex_type)
-            return
 
-    # Can return -1 (as in "no playlist")
-    pos = pos if pos != -1 else 0
-    LOG.debug('playQueue position %s for %s', pos, playqueue)
-    # Have we already initiated playback?
-    try:
-        item = playqueue.items[pos]
-    except IndexError:
-        LOG.debug('PKC playqueue yet empty, need to initialize playback')
-        initiate = True
-    else:
-        if item.plex_id != plex_id:
-            LOG.debug('Received new plex_id %s, expected %s. Init playback',
-                      plex_id, item.plex_id)
+        # Can return -1 (as in "no playlist")
+        pos = pos if pos != -1 else 0
+        LOG.debug('playQueue position %s for %s', pos, playqueue)
+        # Have we already initiated playback?
+        try:
+            item = playqueue.items[pos]
+        except IndexError:
+            LOG.debug('PKC playqueue yet empty, need to initialize playback')
             initiate = True
         else:
-            initiate = False
-    with state.LOCK_PLAYQUEUES:
-        if initiate:
-            _playback_init(plex_id, plex_type, playqueue, pos)
-        else:
-            # kick off playback on second pass
-            _conclude_playback(playqueue, pos)
+            if item.plex_id != plex_id:
+                LOG.debug('Received new plex_id %s, expected %s',
+                          plex_id, item.plex_id)
+                initiate = True
+            else:
+                initiate = False
+            if initiate:
+                _playback_init(plex_id, plex_type, playqueue, pos)
+            else:
+                # kick off playback on second pass
+                _conclude_playback(playqueue, pos)
 
 
 def _playlist_playback(plex_id, plex_type):