diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md
index 0bdcca67870..93c69794225 100644
--- a/com.unity.render-pipelines.high-definition/CHANGELOG.md
+++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -102,6 +102,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed Cutoff not working properly with ray tracing shaders default and SG (case 1261292).
 - Fixed shader compilation issue with Hair shader and debug display mode
 - Fixed cubemap static preview not updated when the asset is imported.
+- Fixed wizard DXR setup on non-DXR compatible devices.
 
 ### Changed
 - Preparation pass for RTSSShadows to be supported by render graph.
diff --git a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs
index 08d9e9872e2..b8c9767b20f 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs
@@ -633,7 +633,8 @@ void CheckPersistantNeedReboot()
 
         bool IsDXRAssetCorrect()
             => HDRenderPipeline.defaultAsset != null
-            && HDRenderPipeline.defaultAsset.renderPipelineRayTracingResources != null;
+            && HDRenderPipeline.defaultAsset.renderPipelineRayTracingResources != null
+            && SystemInfo.supportsRayTracing;
         void FixDXRAsset(bool fromAsyncUnused)
         {
             if (!IsHdrpAssetUsedCorrect())
@@ -641,6 +642,8 @@ void FixDXRAsset(bool fromAsyncUnused)
             HDRenderPipeline.defaultAsset.renderPipelineRayTracingResources
                 = AssetDatabase.LoadAssetAtPath<HDRenderPipelineRayTracingResources>(HDUtils.GetHDRenderPipelinePath() + "Runtime/RenderPipelineResources/HDRenderPipelineRayTracingResources.asset");
             ResourceReloader.ReloadAllNullIn(HDRenderPipeline.defaultAsset.renderPipelineRayTracingResources, HDUtils.GetHDRenderPipelinePath());
+            if (!SystemInfo.supportsRayTracing)
+                Debug.LogError("Your hardware and/or OS don't support DXR!");
         }
 
         bool IsDXRScreenSpaceShadowCorrect()