diff --git a/rocclr/runtime/device/pal/paldevice.cpp b/rocclr/runtime/device/pal/paldevice.cpp
index 167f9590d1..9b1dd982ae 100644
--- a/rocclr/runtime/device/pal/paldevice.cpp
+++ b/rocclr/runtime/device/pal/paldevice.cpp
@@ -731,8 +731,8 @@ Device::create(Pal::IDevice* device)
     palSettings->forceHighClocks = appProfile_.enableHighPerformanceState();
     palSettings->longRunningSubmissions = true;
     palSettings->cmdBufBatchedSubmitChainLimit = 0;
-    //palSettings->disableResourceProcessingManager = true;
-    //palSettings->disableScManager = true;
+    palSettings->disableResourceProcessingManager = true;
+    palSettings->disableScManager = true;
 
     // Commit the new settings for the device
     result = iDev()->CommitSettingsAndInit();