diff --git a/source/blender/nodes/geometry/node_geometry_util.cc b/source/blender/nodes/geometry/node_geometry_util.cc
index 14c1ff1a9cd..b3c0bf7e84c 100644
--- a/source/blender/nodes/geometry/node_geometry_util.cc
+++ b/source/blender/nodes/geometry/node_geometry_util.cc
@@ -13,6 +13,7 @@
 #include "NOD_socket.hh"
 #include "NOD_socket_search_link.hh"
 
+#include "RNA_access.hh"
 #include "RNA_enum_types.hh"
 
 namespace blender::nodes {
@@ -71,18 +72,24 @@ bool generic_attribute_type_supported(const EnumPropertyItem &item)
               CD_PROP_FLOAT4X4);
 }
 
-const EnumPropertyItem *domain_experimental_grease_pencil_version3_fn(bContext * /*C*/,
-                                                                      PointerRNA * /*ptr*/,
-                                                                      PropertyRNA * /*prop*/,
+const EnumPropertyItem *domain_experimental_grease_pencil_version3_fn(bContext *C,
+                                                                      PointerRNA *ptr,
+                                                                      PropertyRNA *prop,
                                                                       bool *r_free)
 {
+  const EnumPropertyItem *static_items;
+  int static_items_num;
+  bool static_items_free;
+  RNA_property_enum_items_ex(
+      C, ptr, prop, true, &static_items, &static_items_num, &static_items_free);
+  BLI_assert(!static_items_free);
+
   *r_free = true;
-  return enum_items_filter(rna_enum_attribute_domain_items,
-                           [](const EnumPropertyItem &item) -> bool {
-                             return (bke::AttrDomain(item.value) == bke::AttrDomain::Layer) ?
-                                        U.experimental.use_grease_pencil_version3 :
-                                        true;
-                           });
+  return enum_items_filter(static_items, [](const EnumPropertyItem &item) -> bool {
+    return (bke::AttrDomain(item.value) == bke::AttrDomain::Layer) ?
+               U.experimental.use_grease_pencil_version3 :
+               true;
+  });
 }
 
 const EnumPropertyItem *domain_without_corner_experimental_grease_pencil_version3_fn(
diff --git a/source/blender/nodes/geometry/nodes/node_geo_viewer.cc b/source/blender/nodes/geometry/nodes/node_geo_viewer.cc
index bcaa3fe09a7..7843485dbb6 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_viewer.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_viewer.cc
@@ -135,7 +135,8 @@ static void node_rna(StructRNA *srna)
                     "Domain to evaluate the field on",
                     rna_enum_attribute_domain_with_auto_items,
                     NOD_storage_enum_accessors(domain),
-                    int(AttrDomain::Point));
+                    int(AttrDomain::Point),
+                    enums::domain_experimental_grease_pencil_version3_fn);
 }
 
 static void node_register()