diff --git a/src/Ryujinx.Graphics.Vulkan/PipelineBase.cs b/src/Ryujinx.Graphics.Vulkan/PipelineBase.cs
index d001c46e6..b1dce459e 100644
--- a/src/Ryujinx.Graphics.Vulkan/PipelineBase.cs
+++ b/src/Ryujinx.Graphics.Vulkan/PipelineBase.cs
@@ -994,7 +994,7 @@ namespace Ryujinx.Graphics.Vulkan
 
         public void SetPatchParameters(int vertices, ReadOnlySpan<float> defaultOuterLevel, ReadOnlySpan<float> defaultInnerLevel)
         {
-            if (Gd.ExtendedDynamicState2Features.ExtendedDynamicState2PatchControlPoints)
+            if (Gd.ExtendedDynamicState2Features.ExtendedDynamicState2PatchControlPoints && _newState.HasTessellationControlShader)
             {
                 DynamicState.SetPatchControlPoints((uint)vertices);
             }
diff --git a/src/Ryujinx.Graphics.Vulkan/PipelineState.cs b/src/Ryujinx.Graphics.Vulkan/PipelineState.cs
index ddbe50f8a..1c83cc16d 100644
--- a/src/Ryujinx.Graphics.Vulkan/PipelineState.cs
+++ b/src/Ryujinx.Graphics.Vulkan/PipelineState.cs
@@ -432,7 +432,7 @@ namespace Ryujinx.Graphics.Vulkan
                     SType = StructureType.PipelineTessellationStateCreateInfo,
                 };
 
-                if (!gd.ExtendedDynamicState2Features.ExtendedDynamicState2PatchControlPoints)
+                if (!gd.ExtendedDynamicState2Features.ExtendedDynamicState2)
                 {
                     tessellationState.PatchControlPoints = PatchControlPoints;
                 }
@@ -587,7 +587,7 @@ namespace Ryujinx.Graphics.Vulkan
                     {
                         additionalDynamicStatesCount++;
                     }
-                    if (gd.ExtendedDynamicState2Features.ExtendedDynamicState2PatchControlPoints)
+                    if (gd.ExtendedDynamicState2Features.ExtendedDynamicState2PatchControlPoints && HasTessellationControlShader)
                     {
                         additionalDynamicStatesCount++;
                     }
@@ -642,7 +642,7 @@ namespace Ryujinx.Graphics.Vulkan
                     {
                         dynamicStates[currentIndex++] = DynamicState.LogicOpExt;
                     }
-                    if (gd.ExtendedDynamicState2Features.ExtendedDynamicState2PatchControlPoints)
+                    if (gd.ExtendedDynamicState2Features.ExtendedDynamicState2PatchControlPoints && HasTessellationControlShader)
                     {
                         dynamicStates[currentIndex++] = DynamicState.PatchControlPointsExt;
                     }