diff --git a/source/loader/layers/sanitizer/msan/msan_shadow.cpp b/source/loader/layers/sanitizer/msan/msan_shadow.cpp
index 8b210a2717..d4446d4dcf 100644
--- a/source/loader/layers/sanitizer/msan/msan_shadow.cpp
+++ b/source/loader/layers/sanitizer/msan/msan_shadow.cpp
@@ -141,7 +141,7 @@ ur_result_t MsanShadowMemoryGPU::Setup() {
     // To reserve very large amount of GPU virtual memroy, the pStart param
     // should be beyond the SVM range, so that GFX driver will automatically
     // switch to reservation on the GPU heap.
-    const void *StartAddress = (void *)(0x100'0000'0000'0000ULL);
+    const void *StartAddress = (void *)GetStartAddress();
     // TODO: Protect Bad Zone
     auto Result = getContext()->urDdiTable.VirtualMem.pfnReserve(
         Context, StartAddress, ShadowSize, (void **)&ShadowBegin);
diff --git a/source/loader/layers/sanitizer/msan/msan_shadow.hpp b/source/loader/layers/sanitizer/msan/msan_shadow.hpp
index 51847e4907..29b4a6d96a 100644
--- a/source/loader/layers/sanitizer/msan/msan_shadow.hpp
+++ b/source/loader/layers/sanitizer/msan/msan_shadow.hpp
@@ -103,6 +103,8 @@ struct MsanShadowMemoryGPU : public MsanShadowMemory {
 
   virtual size_t GetShadowSize() = 0;
 
+  virtual uptr GetStartAddress() { return 0; }
+
 private:
   ur_result_t EnqueueMapShadow(ur_queue_handle_t Queue, uptr Ptr, uptr Size,
                                std::vector<ur_event_handle_t> &EventWaitList,
@@ -134,6 +136,8 @@ struct MsanShadowMemoryPVC final : public MsanShadowMemoryGPU {
   uptr MemToShadow(uptr Ptr) override;
 
   size_t GetShadowSize() override { return 0x8000'0000'0000ULL; }
+
+  uptr GetStartAddress() override { return 0x100'0000'0000'0000ULL; }
 };
 
 /// Shadow Memory layout of GPU DG2 device
diff --git a/source/loader/layers/sanitizer/sanitizer_common/sanitizer_utils.cpp b/source/loader/layers/sanitizer/sanitizer_common/sanitizer_utils.cpp
index c135be0bf7..539adee4ef 100644
--- a/source/loader/layers/sanitizer/sanitizer_common/sanitizer_utils.cpp
+++ b/source/loader/layers/sanitizer/sanitizer_common/sanitizer_utils.cpp
@@ -159,10 +159,10 @@ DeviceType GetDeviceType(ur_context_handle_t Context,
 
     // L0 changes their VA layout.
     // TODO: update our shadow memory layout/algorithms to accordingly.
-    if (Ptr >> 52 == 0xff0U) {
-      Type = DeviceType::GPU_PVC;
-    } else {
+    if ((Ptr >> 48) == 0xffffU) {
       Type = DeviceType::GPU_DG2;
+    } else {
+      Type = DeviceType::GPU_PVC;
     }
     Result = getContext()->urDdiTable.USM.pfnFree(Context, (void *)Ptr);
     assert(Result == UR_RESULT_SUCCESS &&