diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md
index 637f00f3e73..c3dead6e8dc 100644
--- a/com.unity.render-pipelines.high-definition/CHANGELOG.md
+++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -54,6 +54,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed issue with compositor custom pass hooks added/removed repeatedly (case 1315971).
 - Fixed: SSR with transparent (case 1311088)
 - Fixed decals in material debug display.
+- Fix crash on VolumeComponentWithQualityEditor when the current Pipeline is not HDRP
 
 - Fixed WouldFitInAtlas that would previously return wrong results if any one face of a point light would fit (it used to return true even though the light in entirety wouldn't fit).
 
diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/VolumeComponentWithQualityEditor.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/VolumeComponentWithQualityEditor.cs
index 392332b145a..46d63a2591b 100644
--- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/VolumeComponentWithQualityEditor.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/VolumeComponentWithQualityEditor.cs
@@ -139,8 +139,7 @@ public override void OnEnable()
 
             // Ensure we reflect presets in the pipeline asset, not the hardcoded defaults.
             // Warning: base.OnEnable must be called after VolumeComponentWithQuality has unpacked SerializedData.
-            var pipeline = (HDRenderPipeline)RenderPipelineManager.currentPipeline;
-            if (pipeline != null)
+            if (RenderPipelineManager.currentPipeline is HDRenderPipeline pipeline)
             {
                 serializedObject.Update();