diff --git a/Source/Editor/CustomEditors/Values/ValueContainer.cs b/Source/Editor/CustomEditors/Values/ValueContainer.cs
index c8d44b32a..b9bd66623 100644
--- a/Source/Editor/CustomEditors/Values/ValueContainer.cs
+++ b/Source/Editor/CustomEditors/Values/ValueContainer.cs
@@ -297,6 +297,11 @@ namespace FlaxEditor.CustomEditors
                         else if (Type.Type == typeof(long))
                             _defaultValue = Convert.ToInt64(_defaultValue);
                     }
+                    else if (_defaultValue == null && Type.IsValueType)
+                    {
+                        // Use zero value for value-types that have null as default value for some reason
+                        _defaultValue = Type.CreateInstance();
+                    }
                 }
             }
             if (instanceValues._hasReferenceValue)