diff --git a/resources/lib/PlaybackUtils.py b/resources/lib/PlaybackUtils.py
index 649a09c2..8211e115 100644
--- a/resources/lib/PlaybackUtils.py
+++ b/resources/lib/PlaybackUtils.py
@@ -154,7 +154,10 @@ class PlaybackUtils():
             defaultsubs = ""
             for stream in mediaStream:
                 if u'Subtitle' in stream[u'Type'] and stream[u'IsDefault']:
-                    defaultsubs = stream[u'Codec']
+                    if u'Language' in stream:
+                        defaultsubs = stream[u'Language']
+                    else:
+                        defaultsubs = stream[u'Codec']
             WINDOW.setProperty("%ssubs" % playurl, defaultsubs.encode('utf-8'))
             if mediaSources[0].get('DefaultAudioStreamIndex') != None:
                 WINDOW.setProperty(playurl+"AudioStreamIndex", str(mediaSources[0].get('DefaultAudioStreamIndex')))  
diff --git a/resources/lib/Player.py b/resources/lib/Player.py
index b899ddc5..fe1e469a 100644
--- a/resources/lib/Player.py
+++ b/resources/lib/Player.py
@@ -309,25 +309,34 @@ class Player( xbmc.Player ):
                     self.logMsg("Door 3", 2)
                     # 1. There one audio track.
                     # 2. The audio is undefined or a codec.
-                    # 3. Audio pref could be mislabelled.
-                    if addon.getSetting('subsoverride') == "true":
-                        if self.subsPref in subs:
+                    # 3. Audio track is be mislabeled.
+                    if self.subsPref in subs:
+                        # If the subtitle is available, only display
+                        # if the setting is enabled.
+                        if addon.getSetting('subsoverride') == "true":
                             # Subs are forced.
-                            self.logMsg("Door 3.1", 2)
-                            # Only display if subs language is different than audio.
+                            self.logMsg("Door 3.2", 2)
                             index = subs.index(self.subsPref)
                             xbmcplayer.setSubtitleStream(index)
+                        else:
+                            # Let the user decide, since track is mislabeled.
+                            self.logMsg("Door 3.3")
+                            xbmcplayer.showSubtitles(False)
                     else:
                         # Use default subs
                         if defaultsubs == "ssa":
                             # For some reason, Kodi sees SSA as ''
-                            self.logMsg("Door 3.2", 2)
+                            self.logMsg("Door 3.4", 2)
                             index = subs.index('')
                             xbmcplayer.setSubtitleStream(index)
                         elif defaultsubs:
-                            self.logMsg("Door 3.3", 2)
+                            self.logMsg("Door 3.5", 2)
                             index = subs.index(defaultsubs)
                             xbmcplayer.setSubtitleStream(index)
+                        else:
+                            # Nothing matches, let the user decide.
+                            self.logMsg("Door 3.6", 2)
+                            xbmcplayer.showSubtitles(False)
             
             # we may need to wait until the info is available
             item_id = WINDOW.getProperty(currentFile + "item_id")