diff --git a/tests/Squidex.Infrastructure.Tests/States/StateSnapshotTests.cs b/tests/Squidex.Infrastructure.Tests/States/StateSnapshotTests.cs
index 9ccb867df..2465e5e53 100644
--- a/tests/Squidex.Infrastructure.Tests/States/StateSnapshotTests.cs
+++ b/tests/Squidex.Infrastructure.Tests/States/StateSnapshotTests.cs
@@ -28,6 +28,11 @@ namespace Squidex.Infrastructure.States
 
             public long ExpectedVersion { get; set; }
 
+            public long Version
+            {
+                get { return persistence.Version; }
+            }
+
             public int State
             {
                 get { return state; }
@@ -94,6 +99,20 @@ namespace Squidex.Infrastructure.States
             Assert.Equal(123, statefulObject.State);
         }
 
+        [Fact]
+        public async Task Should_set_to_empty_when_store_returns_not_found()
+        {
+            statefulObject.ExpectedVersion = EtagVersion.Any;
+
+            A.CallTo(() => snapshotStore.ReadAsync(key))
+                .Returns((123, EtagVersion.NotFound));
+
+            var actualObject = await sut.GetSingleAsync<MyStatefulObject>(key);
+
+            Assert.Equal(-1, statefulObject.Version);
+            Assert.Equal( 0, statefulObject.State);
+        }
+
         [Fact]
         public async Task Should_throw_exception_if_not_found()
         {