diff --git a/tools/generator/GenBase.cs b/tools/generator/GenBase.cs
index e30989c3a..4d79c6cc4 100644
--- a/tools/generator/GenBase.cs
+++ b/tools/generator/GenBase.cs
@@ -813,11 +813,12 @@ GenBase GetBaseGen ()
 
 		public virtual void UpdateEnums (CodeGenerationOptions opt)
 		{
-			if (enum_updated)
+			if (enum_updated || !IsGeneratable)
 				return;
 			enum_updated = true;
-			for (var b = GetBaseGen (); b != null; b = b.GetBaseGen ())
-				b.UpdateEnums (opt);
+			var baseGen = GetBaseGen ();
+			if (baseGen != null)
+				baseGen.UpdateEnums (opt);
 
 			foreach (Method m in methods) {
 				AutoDetectEnumifiedOverrideParameters (m, opt);