diff --git a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/Stores/EntityFrameworkWorkflowInstanceStore.cs b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/Stores/EntityFrameworkWorkflowInstanceStore.cs
index 2f3cc6a2e..ec0a88b51 100644
--- a/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/Stores/EntityFrameworkWorkflowInstanceStore.cs
+++ b/src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/Stores/EntityFrameworkWorkflowInstanceStore.cs
@@ -38,6 +38,7 @@ namespace Elsa.Persistence.EntityFramework.Core.Stores
             };
 
             var json = _contentSerializer.Serialize(data);
+            
             DbContext.Entry(entity).Property("Data").CurrentValue = json;
         }
 
@@ -55,8 +56,10 @@ namespace Elsa.Persistence.EntityFramework.Core.Stores
             };
             
             var json = (string)DbContext.Entry(entity).Property("Data").CurrentValue;
-            data = JsonConvert.DeserializeAnonymousType(json, data, DefaultContentSerializer.CreateDefaultJsonSerializationSettings());
-
+            
+            if(!string.IsNullOrWhiteSpace(json))
+                data = JsonConvert.DeserializeAnonymousType(json, data, DefaultContentSerializer.CreateDefaultJsonSerializationSettings());
+            
             entity.Output = data.Output;
             entity.Variables = data.Variables;
             entity.ActivityData = data.ActivityData;