diff --git a/src/Squidex.Infrastructure.MongoDb/States/MongoStateStore.cs b/src/Squidex.Infrastructure.MongoDb/States/MongoStateStore.cs
index d65bc6416..24b8e3f9b 100644
--- a/src/Squidex.Infrastructure.MongoDb/States/MongoStateStore.cs
+++ b/src/Squidex.Infrastructure.MongoDb/States/MongoStateStore.cs
@@ -67,7 +67,9 @@ namespace Squidex.Infrastructure.States
                         Builders<MongoState<T>>.Filter.Eq(x => x.Id, key),
                         Builders<MongoState<T>>.Filter.Eq(x => x.Etag, oldEtag)
                     ),
-                    Builders<MongoState<T>>.Update.Set(x => x.Doc, value),
+                    Builders<MongoState<T>>.Update
+                        .Set(x => x.Doc, value)
+                        .Set(x => x.Etag, newEtag),
                     Upsert);
             }
             catch (MongoWriteException ex)
diff --git a/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs b/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs
index 69146ece2..e02d66871 100644
--- a/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs
+++ b/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs
@@ -101,8 +101,10 @@ namespace Squidex.Areas.Api.Controllers.Assets
                         }
                     }
                 }
-
-                await assetStorage.DownloadAsync(assetId, asset.FileVersion, null, bodyStream);
+                else
+                {
+                    await assetStorage.DownloadAsync(assetId, asset.FileVersion, null, bodyStream);
+                }
             });
         }