diff --git a/OpenRA.Game/Scripting/ScriptMemberExts.cs b/OpenRA.Game/Scripting/ScriptMemberExts.cs
index 8500a04206..9db5a55d7e 100644
--- a/OpenRA.Game/Scripting/ScriptMemberExts.cs
+++ b/OpenRA.Game/Scripting/ScriptMemberExts.cs
@@ -30,6 +30,10 @@ namespace OpenRA.Scripting
 		{
 			if (!LuaTypeNameReplacements.TryGetValue(t.Name, out var ret))
 				ret = t.Name;
+
+			if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Nullable<>))
+				ret = "{0}?".F(t.GetGenericArguments().Select(p => p.Name).First());
+
 			return ret;
 		}