diff --git a/resources/lib/player.py b/resources/lib/player.py
index fff2ef01..c94616a2 100644
--- a/resources/lib/player.py
+++ b/resources/lib/player.py
@@ -22,14 +22,10 @@ LOG = logging.getLogger("EMBY."+__name__)
 
 class Player(xbmc.Player):
 
-    # Borg - multiple instances, shared state
-    _shared_state = {}
     played = {}
     up_next = False
 
     def __init__(self):
-
-        self.__dict__ = self._shared_state
         xbmc.Player.__init__(self)
 
     @silent_catch()
@@ -47,7 +43,9 @@ class Player(xbmc.Player):
 
         ''' We may need to wait for info to be set in kodi monitor.
             Accounts for scenario where Kodi starts playback and exits immediately.
+            First, ensure previous playback terminated correctly in Emby.
         '''
+        self.stop_playback()
         self.up_next = False
         count = 0
         monitor = xbmc.Monitor()