diff --git a/src/Connected.Data/Storage/ReturnValueBinder.cs b/src/Connected.Data/Storage/ReturnValueBinder.cs
index 5e8678e..5797a19 100644
--- a/src/Connected.Data/Storage/ReturnValueBinder.cs
+++ b/src/Connected.Data/Storage/ReturnValueBinder.cs
@@ -89,10 +89,10 @@ namespace Connected.Data.Storage
 						var defaultValue = property.PropertyType.GetDefault();
 
 						if (Equals(existingValue, defaultValue))
-							property.SetValue(entity, parameter.Value);
+							property.SetValue(entity, TypeConversion.Convert(parameter.Value, property.PropertyType));
 						break;
 					case PropertyValueBehavior.AlwaysOverwrite:
-						property.SetValue(entity, parameter.Value);
+						property.SetValue(entity, TypeConversion.Convert(parameter.Value, property.PropertyType));
 						break;
 				}
 			}