diff --git a/resources/lib/kodimonitor.py b/resources/lib/kodimonitor.py
index 78846b7f..829e113c 100644
--- a/resources/lib/kodimonitor.py
+++ b/resources/lib/kodimonitor.py
@@ -87,13 +87,11 @@ class KodiMonitor(xbmc.Monitor):
                 with app.APP.lock_playqueues:
                     _playback_cleanup()
         elif method == 'Playlist.OnAdd':
-            with app.APP.lock_playqueues:
-                self._playlist_onadd(data)
+            self._playlist_onadd(data)
         elif method == 'Playlist.OnRemove':
             self._playlist_onremove(data)
         elif method == 'Playlist.OnClear':
-            with app.APP.lock_playqueues:
-                self._playlist_onclear(data)
+            self._playlist_onclear(data)
         elif method == "VideoLibrary.OnUpdate":
             # Manually marking as watched/unwatched
             playcount = data.get('playcount')
diff --git a/resources/lib/webservice.py b/resources/lib/webservice.py
index f66b2d05..01f11541 100644
--- a/resources/lib/webservice.py
+++ b/resources/lib/webservice.py
@@ -322,6 +322,8 @@ class QueuePlay(backgroundthread.KillableThread):
             LOG.debug('Widget video playback detected')
             video_widget_playback = True
             # Release default.py
+            utils.window('plex.playlist.play', value='true')
+            # The playlist will be ready anyway
             utils.window('plex.playlist.ready', value='true')
             playqueue = PQ.get_playqueue_from_type(v.KODI_TYPE_AUDIO)
             playqueue.clear()
@@ -397,7 +399,6 @@ class QueuePlay(backgroundthread.KillableThread):
                         playqueue.start_playback(start_position)
                     elif video_widget_playback:
                         LOG.info('Start widget video playback')
-                        utils.window('plex.playlist.play', value='true')
                         playqueue.start_playback()
                     else:
                         LOG.info('Start normal playback')