diff --git a/Source/Engine/Graphics/Graphics.cpp b/Source/Engine/Graphics/Graphics.cpp
index 05f52769e..6e27833b0 100644
--- a/Source/Engine/Graphics/Graphics.cpp
+++ b/Source/Engine/Graphics/Graphics.cpp
@@ -207,7 +207,7 @@ bool GraphicsService::Init()
 #endif
         )
     {
-#if !USE_EDITOR && BUILD_RELEASE && !PLATFORM_LINUX && !PLATFORM_CONSOLE // IsDebugToolAttached seams to be enabled on many Linux machines via VK_EXT_tooling_info
+#if !USE_EDITOR && BUILD_RELEASE && !PLATFORM_CONSOLE
         // Block graphics debugging to protect contents
         Platform::Fatal(TEXT("Graphics debugger attached."));
 #endif
diff --git a/Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.Layers.cpp b/Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.Layers.cpp
index 2ce634207..5ac20b613 100644
--- a/Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.Layers.cpp
+++ b/Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.Layers.cpp
@@ -490,12 +490,10 @@ void GPUDeviceVulkan::GetDeviceExtensionsAndLayers(VkPhysicalDevice gpu, Array<c
     }
 
     // Add device layers for debugging
-#ifdef VK_EXT_tooling_info
-    if (ListContains(foundUniqueExtensions, "VK_EXT_tooling_info"))
+    if (ListContains(foundUniqueLayers, "VK_LAYER_RENDERDOC_Capture"))
     {
         IsDebugToolAttached = true;
     }
-#endif
 #if VULKAN_USE_DEBUG_LAYER
     bool hasKhronosStandardValidationLayer = false, hasLunargStandardValidationLayer = false;
 #if VULKAN_USE_KHRONOS_STANDARD_VALIDATION