diff --git a/_studio/mfx_lib/shared/src/libmfxsw.cpp b/_studio/mfx_lib/shared/src/libmfxsw.cpp
index 2bd93d89..12b1e6b0 100644
--- a/_studio/mfx_lib/shared/src/libmfxsw.cpp
+++ b/_studio/mfx_lib/shared/src/libmfxsw.cpp
@@ -686,7 +686,7 @@ static bool QueryImplCaps(std::function < bool (VideoCORE&, mfxU32, mfxU32 , mfx
 #if defined(ANDROID)
     char value[PROPERTY_VALUE_MAX] = {};
 
-    property_get("video.hw.dgpu", value, "1");
+    property_get("vendor.video.hw.dgpu", value, "1");
     use_dgpu = atoi(value);
 #endif
 
@@ -768,6 +768,8 @@ static bool QueryImplCaps(std::function < bool (VideoCORE&, mfxU32, mfxU32 , mfx
                 // otherwise use the last available intel node for codec
                 if (use_dgpu && IsIntelDgpu(fd))
                     return true;
+                if (!use_dgpu && !IsIntelDgpu(fd))
+                    return true;
             }
         }
     }