diff --git a/src/Umbraco.Core/Persistence/PetaPoco.cs b/src/Umbraco.Core/Persistence/PetaPoco.cs
index 21f97643ec..c387373a3b 100644
--- a/src/Umbraco.Core/Persistence/PetaPoco.cs
+++ b/src/Umbraco.Core/Persistence/PetaPoco.cs
@@ -562,6 +562,12 @@ namespace Umbraco.Core.Persistence
 					{
 						object val = cmd.ExecuteScalarWithRetry();
 						OnExecutedCommand(cmd);
+
+					    if (val == null && typeof(T) == typeof(Guid))
+					    {
+					        val = Guid.Empty;
+					    }
+
 						return (T)Convert.ChangeType(val, typeof(T));
 					}
 				}