diff --git a/src/Umbraco.Core/Persistence/Mappers/PetaPocoMapper.cs b/src/Umbraco.Core/Persistence/Mappers/PetaPocoMapper.cs
index 98527a19c4..fd516073ce 100644
--- a/src/Umbraco.Core/Persistence/Mappers/PetaPocoMapper.cs
+++ b/src/Umbraco.Core/Persistence/Mappers/PetaPocoMapper.cs
@@ -20,12 +20,6 @@ namespace Umbraco.Core.Persistence.Mappers
 
         public Func<object, object> GetFromDbConverter(PropertyInfo pi, Type sourceType)
         {
-            // Udi is handled as string
-            if (typeof(Udi).IsAssignableFrom(pi.PropertyType) && sourceType == typeof(string))
-                return value => value is string stringValue
-                    ? (string.IsNullOrWhiteSpace(stringValue) ? null : Udi.Parse(stringValue))
-                    : null;
-
             return null;
         }
 
@@ -45,11 +39,7 @@ namespace Umbraco.Core.Persistence.Mappers
                 };
             }
 
-            // Udi is handled as string
-            if (typeof(Udi).IsAssignableFrom(sourceType))
-                return value => value?.ToString();
-
             return null;
         }
     }
-}
+}
\ No newline at end of file