diff --git a/resources/lib/playbackmanager.py b/resources/lib/playbackmanager.py
index 92986af6..922e2a0b 100644
--- a/resources/lib/playbackmanager.py
+++ b/resources/lib/playbackmanager.py
@@ -5,7 +5,7 @@
 from xbmc import sleep
 from api import Api
 from demo import DemoOverlay
-from player import Player
+from player import UpNextPlayer
 from playitem import PlayItem
 from state import State
 from stillwatching import StillWatching
@@ -21,7 +21,7 @@ def __init__(self):
         self.api = Api()
         self.play_item = PlayItem()
         self.state = State()
-        self.player = Player()
+        self.player = UpNextPlayer()
         self.demo = DemoOverlay(12005)
 
     def log(self, msg, level=2):
diff --git a/resources/lib/playitem.py b/resources/lib/playitem.py
index 8383a08f..0436f4f8 100644
--- a/resources/lib/playitem.py
+++ b/resources/lib/playitem.py
@@ -4,7 +4,7 @@
 from __future__ import absolute_import, division, unicode_literals
 from xbmc import PlayList
 from api import Api
-from player import Player
+from player import UpNextPlayer
 from state import State
 from utils import log as ulog
 
@@ -15,7 +15,7 @@ class PlayItem:
     def __init__(self):
         self.__dict__ = self._shared_state
         self.api = Api()
-        self.player = Player()
+        self.player = UpNextPlayer()
         self.state = State()
 
     def log(self, msg, level=2):
@@ -58,7 +58,7 @@ def get_next(self):
 
         # Next video from Kodi library
         else:
-            current_file = self.player.getPlayingFile()
+            current_file = self.player.get_last_file()
             # Get the active player
             result = self.api.get_now_playing()
             self.handle_now_playing_result(result)