diff --git a/resources/site-packages/elementum/rpc.py b/resources/site-packages/elementum/rpc.py
index c27a5115b..b17701ba9 100644
--- a/resources/site-packages/elementum/rpc.py
+++ b/resources/site-packages/elementum/rpc.py
@@ -126,7 +126,7 @@ def OpenDirectory(self, path):
         xbmc.executebuiltin('ActivateWindow(Videos,%s)' % path)
 
     def Wait_Window_Loaded(self):
-        tries = 7
+        tries = 9
         while self.Window_Is_Loading():
             if tries == 0:
                 log.error("Failed to wait till window has finished loading")
@@ -198,7 +198,8 @@ def Player_Open_With_Labels(self, url, infolabels):
         # return xbmc.Player().play(url, listitem=item)
 
     def Player_Open_With_Timeout(self, item):
-        self.Wait_Window_Loaded()
+        if not self.Wait_Window_Loaded():
+            return
 
         return self.Player_Open(item)