diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 64eb734582f..4ba297aa649 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -380,8 +380,13 @@ zink_get_shader_param(struct pipe_screen *pscreen,
       switch (shader) {
       case PIPE_SHADER_FRAGMENT:
       case PIPE_SHADER_VERTEX:
-      case PIPE_SHADER_GEOMETRY:
          return INT_MAX;
+
+      case PIPE_SHADER_GEOMETRY:
+         if (screen->info.feats.features.geometryShader)
+            return INT_MAX;
+         break;
+
       default:
          break;
       }