diff --git a/AVOutput/AVOutputTV.cpp b/AVOutput/AVOutputTV.cpp
index 6e74a5a2..868aced2 100644
--- a/AVOutput/AVOutputTV.cpp
+++ b/AVOutput/AVOutputTV.cpp
@@ -4422,7 +4422,7 @@ namespace Plugin {
             }
             else {
                 LOGINFO("setLocalParam for %s Successful, Value: %s\n", AVOUTPUT_SOURCE_PICTUREMODE_STRING_RFC_PARAM, mode.c_str());
-                int pqmodeindex = (int)getPictureModeIndex(mode);
+                int pqmodeindex = (int)convertPictureStringToIndexV2(std::string(mode));
                 SaveSourcePictureMode(ctx.videoSrcType, ctx.videoFormatType, pqmodeindex);
             }
 
@@ -4623,7 +4623,7 @@ namespace Plugin {
             }
 
             // Save to internal config
-            int pqmodeIndex = static_cast<int>(getPictureModeIndex(param.value));
+            int pqmodeIndex = static_cast<int>(convertPictureStringToIndexV2(std::string(param.value)));
             SaveSourcePictureMode(ctx.videoSrcType, ctx.videoFormatType, pqmodeIndex);
             contextHandled = true;
         }
diff --git a/AVOutput/CHANGELOG.md b/AVOutput/CHANGELOG.md
index 16555037..5662a23a 100644
--- a/AVOutput/CHANGELOG.md
+++ b/AVOutput/CHANGELOG.md
@@ -13,6 +13,10 @@ All notable changes to this RDK Service will be documented in this file.
     * **Security** in case of vulnerabilities.
 
 * Changes in CHANGELOG should be updated when commits are added to the main or release branches. There should be one CHANGELOG entry per JIRA Ticket. This is not enforced on sprint branches since there could be multiple changes for the same JIRA ticket during development. 
+## [1.2.1] - 2025-11-01
+### Fixed
+- Fixed PQMOde index issue for Advance PQParams
+
 ## [1.2.0] - 2025-09-12
 ### Added
 - Advance PQ Params