diff --git a/resources/lib/database/queries.py b/resources/lib/database/queries.py
index 2ae43a68..24e7aab4 100644
--- a/resources/lib/database/queries.py
+++ b/resources/lib/database/queries.py
@@ -1,6 +1,6 @@
 
 get_item =              """ SELECT  kodi_id, kodi_fileid, kodi_pathid, parent_id, media_type, 
-						            emby_type, media_folder 
+						            emby_type, media_folder, emby_parent_id  
 				            FROM	emby 
 				            WHERE 	emby_id = ? 
 			            """
diff --git a/resources/lib/entrypoint/service.py b/resources/lib/entrypoint/service.py
index 46e5ab9f..008bfe99 100644
--- a/resources/lib/entrypoint/service.py
+++ b/resources/lib/entrypoint/service.py
@@ -46,6 +46,7 @@ class Service(xbmc.Monitor):
         self.settings['profile'] = xbmc.translatePath('special://profile')
         self.settings['mode'] = settings('useDirectPaths')
         self.settings['log_level'] = settings('logLevel') or "1"
+        self.settings['auth_check'] = True
         self.settings['enable_context'] = settings('enableContext.bool')
         self.settings['enable_context_transcode'] = settings('enableContextTranscode.bool')
         self.settings['kodi_companion'] = settings('kodiCompanion.bool')
@@ -199,6 +200,7 @@ class Service(xbmc.Monitor):
             if data['ServerId'] is None:
 
                 window('emby_online.bool', True)
+                self.settings['auth_check'] = True
                 self.warn = True
 
                 if self.library_thread is None:
@@ -224,6 +226,16 @@ class Service(xbmc.Monitor):
         elif method == 'Unauthorized':
             dialog("notification", heading="{emby}", message=_(33147) if data['ServerId'] is None else _(33148), icon=xbmcgui.NOTIFICATION_ERROR)
 
+            if data.get('ServerId') is None and self.settings['auth_check']:
+
+                self.settings['auth_check'] = False
+                self.stop_default()
+
+                if self.waitForAbort(5):
+                    return
+                
+                self.start_default()
+
         elif method == 'ServerRestarting':
             if data.get('ServerId'):
                 return