diff --git a/projects/clr/rocclr/runtime/device/gpu/gpuvirtual.cpp b/projects/clr/rocclr/runtime/device/gpu/gpuvirtual.cpp
index 902c6fa885..43c6e42e8d 100644
--- a/projects/clr/rocclr/runtime/device/gpu/gpuvirtual.cpp
+++ b/projects/clr/rocclr/runtime/device/gpu/gpuvirtual.cpp
@@ -2806,7 +2806,6 @@ VirtualGPU::awaitCompletion(CommandBatch* cb, const amd::Event* waitingEvent)
 
     // Make sure that profiling is enabled
     if (profileEnabled_) {
-        profileEnabled_ = false;
         return profilingCollectResults(cb, waitingEvent);
     }
     // Mark the first command in the batch as running
diff --git a/projects/clr/rocclr/runtime/device/gpu/gpuwavelimiter.cpp b/projects/clr/rocclr/runtime/device/gpu/gpuwavelimiter.cpp
index 58b624a59b..52cecb7321 100644
--- a/projects/clr/rocclr/runtime/device/gpu/gpuwavelimiter.cpp
+++ b/projects/clr/rocclr/runtime/device/gpu/gpuwavelimiter.cpp
@@ -228,7 +228,9 @@ uint WaveLimiterManager::getWavesPerSH(const device::VirtualDevice *vdev) const
         return 0;
     }
     auto loc = limiters_.find(vdev);
-    assert (loc != limiters_.end());
+    if (loc == limiters_.end()) {
+        return 0;
+    }
     assert(loc->second != NULL);
     return loc->second->getWavesPerSH();
 }