diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
index 2ab7c97f7..eff7b2cf5 100644
--- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
+++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
@@ -82,11 +82,17 @@ GraphicsPipeline::GraphicsPipeline(const Instance& instance_, Scheduler& schedul
                     "Rectangle List primitive type is only supported for embedded VS");
     }
 
+    auto prim_restart = key.enable_primitive_restart != 0;
+    if (prim_restart && IsPrimitiveListTopology() && !instance.IsListRestartSupported()) {
+        LOG_WARNING(Render_Vulkan,
+                    "Primitive restart is enabled for list topology but not supported by driver.");
+        prim_restart = false;
+    }
     const vk::PipelineInputAssemblyStateCreateInfo input_assembly = {
         .topology = LiverpoolToVK::PrimitiveType(key.prim_type),
-        .primitiveRestartEnable = key.enable_primitive_restart != 0,
+        .primitiveRestartEnable = prim_restart,
     };
-    ASSERT_MSG(!key.enable_primitive_restart || key.primitive_restart_index == 0xFFFF ||
+    ASSERT_MSG(!prim_restart || key.primitive_restart_index == 0xFFFF ||
                    key.primitive_restart_index == 0xFFFFFFFF,
                "Primitive restart index other than -1 is not supported yet");
 
diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.h b/src/video_core/renderer_vulkan/vk_graphics_pipeline.h
index 74817656a..bcada1689 100644
--- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.h
+++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.h
@@ -83,6 +83,16 @@ public:
         return key.depth_stencil.depth_enable.Value();
     }
 
+    [[nodiscard]] bool IsPrimitiveListTopology() const {
+        return key.prim_type == Liverpool::PrimitiveType::PointList ||
+               key.prim_type == Liverpool::PrimitiveType::LineList ||
+               key.prim_type == Liverpool::PrimitiveType::TriangleList ||
+               key.prim_type == Liverpool::PrimitiveType::AdjLineList ||
+               key.prim_type == Liverpool::PrimitiveType::AdjTriangleList ||
+               key.prim_type == Liverpool::PrimitiveType::RectList ||
+               key.prim_type == Liverpool::PrimitiveType::QuadList;
+    }
+
 private:
     void BuildDescSetLayout();
 
diff --git a/src/video_core/renderer_vulkan/vk_instance.cpp b/src/video_core/renderer_vulkan/vk_instance.cpp
index 36272ba2a..85673410b 100644
--- a/src/video_core/renderer_vulkan/vk_instance.cpp
+++ b/src/video_core/renderer_vulkan/vk_instance.cpp
@@ -260,8 +260,7 @@ bool Instance::CreateDevice() {
     color_write_en &= add_extension(VK_EXT_EXTENDED_DYNAMIC_STATE_3_EXTENSION_NAME);
     const bool calibrated_timestamps = add_extension(VK_EXT_CALIBRATED_TIMESTAMPS_EXTENSION_NAME);
     const bool robustness = add_extension(VK_EXT_ROBUSTNESS_2_EXTENSION_NAME);
-    const bool topology_restart =
-        add_extension(VK_EXT_PRIMITIVE_TOPOLOGY_LIST_RESTART_EXTENSION_NAME);
+    list_restart = add_extension(VK_EXT_PRIMITIVE_TOPOLOGY_LIST_RESTART_EXTENSION_NAME);
     maintenance5 = add_extension(VK_KHR_MAINTENANCE_5_EXTENSION_NAME);
 
     // These extensions are promoted by Vulkan 1.3, but for greater compatibility we use Vulkan 1.2
@@ -414,7 +413,7 @@ bool Instance::CreateDevice() {
     if (!workgroup_memory_explicit_layout) {
         device_chain.unlink<vk::PhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR>();
     }
-    if (!topology_restart) {
+    if (!list_restart) {
         device_chain.unlink<vk::PhysicalDevicePrimitiveTopologyListRestartFeaturesEXT>();
     }
     if (robustness) {
diff --git a/src/video_core/renderer_vulkan/vk_instance.h b/src/video_core/renderer_vulkan/vk_instance.h
index 0ce61c69e..e019ffba3 100644
--- a/src/video_core/renderer_vulkan/vk_instance.h
+++ b/src/video_core/renderer_vulkan/vk_instance.h
@@ -143,6 +143,10 @@ public:
         return maintenance5;
     }
 
+    bool IsListRestartSupported() const {
+        return list_restart;
+    }
+
     /// Returns the vendor ID of the physical device
     u32 GetVendorID() const {
         return properties.vendorID;
@@ -286,6 +290,7 @@ private:
     bool vertex_input_dynamic_state{};
     bool null_descriptor{};
     bool maintenance5{};
+    bool list_restart{};
     u64 min_imported_host_pointer_alignment{};
     u32 subgroup_size{};
     bool tooling_info{};