diff --git a/src/Umbraco.Core/Services/Implement/DataTypeService.cs b/src/Umbraco.Core/Services/Implement/DataTypeService.cs
index 3552b2d8fc..dc998b18dd 100644
--- a/src/Umbraco.Core/Services/Implement/DataTypeService.cs
+++ b/src/Umbraco.Core/Services/Implement/DataTypeService.cs
@@ -349,6 +349,11 @@ namespace Umbraco.Core.Services.Implement
                     throw new ArgumentException("Cannot save datatype with empty name.");
                 }
 
+                if (dataType.Name != null && dataType.Name.Length > 255)
+                {
+                    throw new InvalidOperationException("Name cannot be more than 255 characters in length.");
+                }
+
                 _dataTypeRepository.Save(dataType);
 
                 saveEventArgs.CanCancel = false;