diff --git a/resources/lib/helper/playutils.py b/resources/lib/helper/playutils.py
index 30859a5e..9007660c 100644
--- a/resources/lib/helper/playutils.py
+++ b/resources/lib/helper/playutils.py
@@ -38,6 +38,7 @@ def set_properties(item, method, server_id=None):
         'Id': item['Id'],
         'Path': info['Path'],
         'PlayMethod': method,
+        'PlayOption': 'Addon' if info.get('PlaySessionId') else 'Native',
         'MediaSourceId': info.get('MediaSourceId', item['Id']),
         'Runtime': item.get('RunTimeTicks'),
         'PlaySessionId': info.get('PlaySessionId', str(uuid4()).replace("-", "")),
diff --git a/resources/lib/player.py b/resources/lib/player.py
index a10aaafe..1ee5c506 100644
--- a/resources/lib/player.py
+++ b/resources/lib/player.py
@@ -118,7 +118,8 @@ class Player(xbmc.Player):
         if monitor.waitForAbort(2):
             return
 
-        self.set_audio_subs(item['AudioStreamIndex'], item['SubtitleStreamIndex'])
+        if item['PlayOption'] == 'Addon':
+            self.set_audio_subs(item['AudioStreamIndex'], item['SubtitleStreamIndex'])
 
     def set_item(self, file, item):