diff --git a/resources/lib/playbackutils.py b/resources/lib/playbackutils.py
index 56a45695..00fb5551 100644
--- a/resources/lib/playbackutils.py
+++ b/resources/lib/playbackutils.py
@@ -200,7 +200,7 @@ class PlaybackUtils():
                         playqueue,
                         self.currentPosition+1,
                         convert_PKC_to_listitem(listitem),
-                        playurl,
+                        file=playurl,
                         kodi_item={'id': kodi_id, 'type': kodi_type})
                 else:
                     # Full metadata$
diff --git a/resources/lib/playlist_func.py b/resources/lib/playlist_func.py
index 3d0dc78b..fa439cde 100644
--- a/resources/lib/playlist_func.py
+++ b/resources/lib/playlist_func.py
@@ -535,9 +535,10 @@ def add_listitem_to_Kodi_playlist(playlist, pos, listitem, file,
     # We need to add this to our internal queue as well
     if xml_video_element is not None:
         item = playlist_item_from_xml(playlist, xml_video_element)
-        item.file = file
     else:
         item = playlist_item_from_kodi(kodi_item)
+    if file is not None:
+        item.file = file
     playlist.items.insert(pos, item)
     log.debug('Done inserting for %s' % playlist)