diff --git a/src/vulkan/util/vk_physical_device_properties_gen.py b/src/vulkan/util/vk_physical_device_properties_gen.py
index 7b8e039df48..dfe7f622f1b 100644
--- a/src/vulkan/util/vk_physical_device_properties_gen.py
+++ b/src/vulkan/util/vk_physical_device_properties_gen.py
@@ -185,7 +185,8 @@ def get_property_structs(doc, api, beta):
             continue
 
         # Skip extensions with a define for now
-        if required[full_name].guard is not None:
+        guard = required[full_name].guard
+        if guard is not None and (guard != "VK_ENABLE_BETA_EXTENSIONS" or not beta):
             continue
 
         # find Vulkan structure type