diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0826108..aff87fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
+* [v3.22.0](https://github.com/newt-sc/a4kSubtitles/releases/tag/service.subtitles.a4ksubtitles%2Fservice.subtitles.a4ksubtitles-3.22.0):
+  * Fix Podnadpisi service returning incorrect language codes.
+  
 * [v3.21.5](https://github.com/newt-sc/a4kSubtitles/releases/tag/service.subtitles.a4ksubtitles%2Fservice.subtitles.a4ksubtitles-3.21.5):
   * SubSource: Fix language handling so all regional variants are detected instead of only one.
+
 * [v3.21.4](https://github.com/newt-sc/a4kSubtitles/releases/tag/service.subtitles.a4ksubtitles%2Fservice.subtitles.a4ksubtitles-3.21.4):
   * SubSource: Fix foreign language handling in the new API.
   * Metainfo: Fix IMDb release year to correctly pull the first release date for TV shows.
diff --git a/a4kSubtitles/services/podnadpisi.py b/a4kSubtitles/services/podnadpisi.py
index c3d6a7e..c9972b3 100644
--- a/a4kSubtitles/services/podnadpisi.py
+++ b/a4kSubtitles/services/podnadpisi.py
@@ -59,7 +59,7 @@ def map_result(result):
 
         name = '%s.srt' % name
         lang_code = result['language']
-        lang = meta.languages[lang_ids.index(lang_code)]
+        lang = meta.languages[lang_ids.index(lang_code)] if lang_code in lang_ids else lang_code
 
         return {
             'service_name': service_name,
diff --git a/a4kSubtitles/services/subdl.py b/a4kSubtitles/services/subdl.py
index 44c4747..b0a245d 100644
--- a/a4kSubtitles/services/subdl.py
+++ b/a4kSubtitles/services/subdl.py
@@ -61,7 +61,7 @@ def parse_search_response(core, service_name, meta, response):
     def map_result(result):
         filename = result['release_name']
         lang_code = result['language'].lower()
-        lang = meta.languages[lang_ids.index(lang_code)]
+        lang = meta.languages[lang_ids.index(lang_code)] if lang_code in lang_ids else lang_code
 
         return {
             'service_name': service_name,
diff --git a/a4kSubtitles/services/subsource.py b/a4kSubtitles/services/subsource.py
index 7b8162d..1cd439b 100644
--- a/a4kSubtitles/services/subsource.py
+++ b/a4kSubtitles/services/subsource.py
@@ -143,7 +143,6 @@ def get_movie(response):
             movie_id = res["movieId"]
             break
 
-
         required_languages = [
             code_langs.get(core.utils.get_lang_id(kodi_lang, core.kodi.xbmc.ISO_639_1), (kodi_lang.lower(),))
             for kodi_lang in meta.languages
diff --git a/addon.xml b/addon.xml
index 9d99bab..f541f94 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="service.subtitles.a4ksubtitles"
        name="a4kSubtitles"
-       version="3.21.4"
+       version="3.22.0"
        provider-name="Unknown">
     <requires>
       <import addon="script.module.requests"/>
@@ -27,8 +27,12 @@ Supports: OpenSubtitles, BSPlayer, Podnadpisi.NET, SubDL, Addic7ed
             <screenshot>screenshot-03.png</screenshot>
         </assets>
     <news>
+[v3.22.0]:
+  * Fix Podnadpisi service returning incorrect language codes.
+
 [v3.21.5]:
   * SubSource: Fix language handling so all regional variants are detected instead of only one.
+
 [v3.21.4]:
   * SubSource: Fix foreign language handling in the new API.
   * Metainfo: Fix IMDb release year to correctly pull the first release date for TV shows.