diff --git a/release/scripts/startup/bl_operators/geometry_nodes.py b/release/scripts/startup/bl_operators/geometry_nodes.py
index 03cd14a3df7..d3f984269f8 100644
--- a/release/scripts/startup/bl_operators/geometry_nodes.py
+++ b/release/scripts/startup/bl_operators/geometry_nodes.py
@@ -38,8 +38,8 @@ def geometry_node_group_empty_new(context):
 def geometry_modifier_poll(context) -> bool:
     ob = context.object
 
-    # Test object support for geometry node modifier (No volume or hair object support yet)
-    if not ob or ob.type not in {'MESH', 'CURVE', 'SURFACE', 'META', 'FONT', 'POINTCLOUD'}:
+    # Test object support for geometry node modifier (No volume, curve, or hair object support yet)
+    if not ob or ob.type not in {'MESH', 'POINTCLOUD'}:
         return False
 
     return True