diff --git a/addon.xml b/addon.xml
index d0846823..035458a4 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="3.5.2" provider-name="croneter">
+<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="3.5.3" provider-name="croneter">
   <requires>
     <import addon="xbmc.python" version="3.0.0"/>
     <import addon="script.module.requests" version="2.22.0+matrix.1" />
@@ -91,7 +91,10 @@
     <summary lang="ko_KR">Plex를 Kodi에 기본 통합</summary>
     <description lang="ko_KR">Kodi를 Plex Media Server에 연결합니다. 이 플러그인은 Plex로 모든 비디오를 관리하고 Kodi로는 관리하지 않는다고 가정합니다. Kodi 비디오 및 음악 데이터베이스에 이미 저장된 데이터가 손실 될 수 있습니다 (이 플러그인이 직접 변경하므로). 자신의 책임하에 사용하십시오!</description>
     <disclaimer lang="ko_KR">자신의 책임하에 사용</disclaimer>
-    <news>version 3.5.2:
+    <news>version 3.5.3:
+- Add playback settings to let the user choose whether Plex or Kodi provides the default audio or subtitle stream on playback start
+
+version 3.5.2:
 - version 3.5.1 for everyone
 
 version 3.5.1 (beta only):
diff --git a/changelog.txt b/changelog.txt
index b3db9478..1c0e446f 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,6 @@
+version 3.5.3:
+- Add playback settings to let the user choose whether Plex or Kodi provides the default audio or subtitle stream on playback start
+
 version 3.5.2:
 - version 3.5.1 for everyone
 
diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po
index bc1515e1..c930a0a7 100644
--- a/resources/language/resource.language.en_gb/strings.po
+++ b/resources/language/resource.language.en_gb/strings.po
@@ -670,6 +670,16 @@ msgctxt "#30546"
 msgid "Pick the first video if several versions are present"
 msgstr ""
 
+# PKC Settings - Playback
+msgctxt "#30547"
+msgid "Who picks the audio stream on playback start?"
+msgstr ""
+
+# PKC Settings - Playback
+msgctxt "#30548"
+msgid "Who picks subtitles on playback start?"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
diff --git a/resources/lib/kodimonitor.py b/resources/lib/kodimonitor.py
index 40633d46..6ec36967 100644
--- a/resources/lib/kodimonitor.py
+++ b/resources/lib/kodimonitor.py
@@ -28,6 +28,7 @@ class KodiMonitor(xbmc.Monitor):
     """
     PKC implementation of the Kodi Monitor class. Invoke only once.
     """
+
     def __init__(self):
         self._already_slept = False
         self._switched_to_plex_streams = True
@@ -389,7 +390,10 @@ class KodiMonitor(xbmc.Monitor):
         if not self._switched_to_plex_streams:
             # We need to switch to the Plex streams ONCE upon playback start
             # after onavchange has been fired
-            item.switch_to_plex_streams()
+            if utils.settings('audioStreamPick') == '0':
+                item.switch_to_plex_stream('audio')
+            if utils.settings('subtitleStreamPick') == '0':
+                item.switch_to_plex_stream('subtitle')
             self._switched_to_plex_streams = True
         else:
             item.on_av_change(playerid)
diff --git a/resources/settings.xml b/resources/settings.xml
index cb059b9c..46066caf 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -115,6 +115,8 @@
         <setting id="trailerNumber" type="slider" label="39000" default="3" visible="eq(-2,true)" range="1,1,15" option="int" />
         <setting id="enableSkipIntro" type="bool" label="30525" default="true" /><!-- Enable skipping of intros -->
         <setting id="firstVideoStream" type="bool" label="30546" default="false" /><!-- Pick the first video if several versions are present -->
+        <setting id="audioStreamPick" type="enum" label="30547" values="Plex|Kodi" default="0" /><!-- Who picks the audio stream on playback start? -->
+        <setting id="subtitleStreamPick" type="enum" label="30548" values="Plex|Kodi" default="0" /><!-- Who picks subtitles on playback start? -->
 	    <setting id="ignoreSpecialsNextEpisodes" type="bool" label="30527" default="false" />
         <setting id="resumeJumpBack" type="slider" label="30521" default="10" range="0,1,120" option="int" visible="false"/>
         <setting type="sep" />