diff --git a/src/Ryujinx.Graphics.Vulkan/PipelineState.cs b/src/Ryujinx.Graphics.Vulkan/PipelineState.cs
index ad9d2d657d..4b37fb9b0a 100644
--- a/src/Ryujinx.Graphics.Vulkan/PipelineState.cs
+++ b/src/Ryujinx.Graphics.Vulkan/PipelineState.cs
@@ -408,7 +408,10 @@ namespace Ryujinx.Graphics.Vulkan
                 PrimitiveRestartEnable &= topologySupportsRestart;
             }
 
-            if (_supportsExtDynamicState)
+            if (_supportsExtDynamicState && (Topology != PrimitiveTopology.LineList ||
+                                             Topology != PrimitiveTopology.TriangleStrip ||
+                                             Topology != PrimitiveTopology.PointList ||
+                                             Topology != PrimitiveTopology.PatchList))
             {
                 Topology = Topology.ConvertToClass();
             }