diff --git a/src/Umbraco.Core/Models/MacroProperty.cs b/src/Umbraco.Core/Models/MacroProperty.cs
index 7752d82814..f44de98eb6 100644
--- a/src/Umbraco.Core/Models/MacroProperty.cs
+++ b/src/Umbraco.Core/Models/MacroProperty.cs
@@ -2,6 +2,7 @@ using System;
 using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Core.Models
 {
@@ -29,6 +30,14 @@ namespace Umbraco.Core.Models
             _alias = alias;
             _name = name;
             _sortOrder = sortOrder;
+
+            //try to get the new mapped parameter editor
+            var mapped = LegacyParameterEditorAliasConverter.GetNewAliasFromLegacyAlias(editorAlias, false);
+            if (mapped.IsNullOrWhiteSpace() == false)
+            {
+                editorAlias = mapped;
+            }
+
             _editorAlias = editorAlias;
         }
 
@@ -46,6 +55,14 @@ namespace Umbraco.Core.Models
             _alias = alias;
             _name = name;
             _sortOrder = sortOrder;
+
+            //try to get the new mapped parameter editor
+            var mapped = LegacyParameterEditorAliasConverter.GetNewAliasFromLegacyAlias(editorAlias, false);
+            if (mapped.IsNullOrWhiteSpace() == false)
+            {
+                editorAlias = mapped;
+            }
+
             _editorAlias = editorAlias;
         }
 
@@ -145,7 +162,17 @@ namespace Umbraco.Core.Models
             {
                 SetPropertyValueAndDetectChanges(o =>
                 {
-                    _editorAlias = value;
+                    //try to get the new mapped parameter editor
+                    var mapped = LegacyParameterEditorAliasConverter.GetNewAliasFromLegacyAlias(value, false);
+                    if (mapped.IsNullOrWhiteSpace() == false)
+                    {
+                        _editorAlias = mapped;
+                    }
+                    else
+                    {
+                        _editorAlias = value;
+                    }
+
                     return _editorAlias;
                 }, _editorAlias, PropertyTypeSelector);
             }
diff --git a/src/umbraco.cms/businesslogic/macro/MacroProperty.cs b/src/umbraco.cms/businesslogic/macro/MacroProperty.cs
index 74caf2fd93..729008cd18 100644
--- a/src/umbraco.cms/businesslogic/macro/MacroProperty.cs
+++ b/src/umbraco.cms/businesslogic/macro/MacroProperty.cs
@@ -123,7 +123,7 @@ namespace umbraco.cms.businesslogic.macro
                 var mapped = LegacyParameterEditorAliasConverter.GetNewAliasFromLegacyAlias(value, false);
                 if (mapped.IsNullOrWhiteSpace() == false)
                 {
-                    _parameterEditorAlias = value;
+                    _parameterEditorAlias = mapped;
                 }
                 else
                 {