diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs
index f632f8d81..992efee1c 100644
--- a/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs
+++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs
@@ -65,7 +65,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets
                 await Collection.Find(filter).Skip(skip).Limit(take).SortByDescending(x => x.State.LastModified)
                     .ToListAsync();
 
-            return assetEntities.OfType<IAssetEntity>().ToList();
+            return assetEntities.Select(x => x.State).ToList();
         }
 
         public async Task<long> CountAsync(Guid appId, HashSet<string> mimeTypes = null, HashSet<Guid> ids = null, string query = null)
diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs
index 4e8bc19d9..dbbe3240d 100644
--- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs
+++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs
@@ -89,7 +89,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents
                 DocumentId = documentId,
                 DataText = idData?.ToFullText(),
                 DataByIds = idData,
-                IsLatest = true,
+                IsLatest = !value.IsDeleted,
                 ReferencedIds = idData?.ToReferencedIds(schema.SchemaDef),
             });