diff --git a/AVOutput/AVOutputTV.cpp b/AVOutput/AVOutputTV.cpp
index 9a7e0671..3adc82ef 100644
--- a/AVOutput/AVOutputTV.cpp
+++ b/AVOutput/AVOutputTV.cpp
@@ -3568,6 +3568,10 @@ namespace Plugin {
                 returnResponse(false);
             }
 
+            if (isPlatformSupport("DimmingMode") != 0) {
+	            returnResponse(false);
+	        }
+
             if( !isCapablityCheckPassed( "DimmingMode" , inputInfo )) {
                 LOGERR("%s: CapablityCheck failed for DimmingMode\n", __FUNCTION__);
                 returnResponse(false);
@@ -3849,6 +3853,7 @@ namespace Plugin {
         paramIndex_t indexInfo;
         int dolbyMode = 0;
         int err = 0;
+        tvVideoFormatType_t video_type = VIDEO_FORMAT_NONE;
 
         if (parsingGetInputArgument(parameters, "DolbyVisionMode",inputInfo) != 0) {
             LOGINFO("%s: Failed to parse argument\n", __FUNCTION__);
@@ -3856,9 +3861,15 @@ namespace Plugin {
         }
 
         if (isPlatformSupport("DolbyVisionMode") != 0) {
-	    returnResponse(false);
-	}
+	        returnResponse(false);
+	    }
 
+        GetCurrentVideoFormat(&video_type);
+        if(video_type != VIDEO_FORMAT_DV)
+        {
+            LOGERR("%s: Invalid video format: %d \n", __FUNCTION__,video_type);
+            returnResponse(false);
+        }
 
         if (getParamIndex("DolbyVisionMode",inputInfo,indexInfo) == -1) {
             LOGERR("%s: getParamIndex failed to get \n", __FUNCTION__);