diff --git a/src/ServiceControl.Persistence.RavenDb5/ErrorMessagesDataStore.cs b/src/ServiceControl.Persistence.RavenDb5/ErrorMessagesDataStore.cs
index 4572697e36..bf6804c5c2 100644
--- a/src/ServiceControl.Persistence.RavenDb5/ErrorMessagesDataStore.cs
+++ b/src/ServiceControl.Persistence.RavenDb5/ErrorMessagesDataStore.cs
@@ -51,7 +51,7 @@ bool includeSystemMessages
                     .Statistics(out var stats)
                     .Sort(sortInfo)
                     .Paging(pagingInfo)
-                    .ProjectInto<FailedMessage>()
+                    .OfType<FailedMessage>()
                     .TransformToMessageView();
 
                 var results = await query.ToListAsync();
@@ -75,7 +75,7 @@ bool includeSystemMessages
                     .Statistics(out var stats)
                     .Sort(sortInfo)
                     .Paging(pagingInfo)
-                    .ProjectInto<FailedMessage>()
+                    .OfType<FailedMessage>()
                     .TransformToMessageView();
 
                 var results = await query.ToListAsync();
@@ -100,7 +100,7 @@ SortInfo sortInfo
                     .Where(m => m.ReceivingEndpointName == endpointName)
                     .Sort(sortInfo)
                     .Paging(pagingInfo)
-                    .ProjectInto<FailedMessage>()
+                    .OfType<FailedMessage>()
                     .TransformToMessageView();
 
                 var results = await query.ToListAsync();
@@ -123,7 +123,7 @@ bool includeSystemMessages
                     .Where(m => m.ConversationId == conversationId)
                     .Sort(sortInfo)
                     .Paging(pagingInfo)
-                    .ProjectInto<FailedMessage>()
+                    .OfType<FailedMessage>()
                     .TransformToMessageView();
 
                 var results = await query.ToListAsync();
@@ -145,7 +145,7 @@ SortInfo sortInfo
                     .Search(x => x.Query, searchTerms)
                     .Sort(sortInfo)
                     .Paging(pagingInfo)
-                    .ProjectInto<FailedMessage>()
+                    .OfType<FailedMessage>()
                     .TransformToMessageView();
 
                 var results = await query.ToListAsync();
diff --git a/src/ServiceControl.Persistence.RavenDb5/Transformers/MessagesViewTransformer.cs b/src/ServiceControl.Persistence.RavenDb5/Transformers/MessagesViewTransformer.cs
index daed587531..c574d65c88 100644
--- a/src/ServiceControl.Persistence.RavenDb5/Transformers/MessagesViewTransformer.cs
+++ b/src/ServiceControl.Persistence.RavenDb5/Transformers/MessagesViewTransformer.cs
@@ -7,7 +7,7 @@ namespace ServiceControl.CompositeViews.Messages
 
     static class MessagesViewTransformer //https://ravendb.net/docs/article-page/4.2/csharp/migration/client-api/session/querying/transformers
     {
-        public static IQueryable<MessagesView> TransformToMessageView(this IRavenQueryable<FailedMessage> query)
+        public static IQueryable<MessagesView> TransformToMessageView(this IQueryable<FailedMessage> query)
         {
             var results =
                 from message in query
diff --git a/src/ServiceControl.Persistence.Tests.RavenDb5/CompositeViews/MessagesViewTests.cs b/src/ServiceControl.Persistence.Tests.RavenDb5/CompositeViews/MessagesViewTests.cs
index e753e208de..17cd1e760c 100644
--- a/src/ServiceControl.Persistence.Tests.RavenDb5/CompositeViews/MessagesViewTests.cs
+++ b/src/ServiceControl.Persistence.Tests.RavenDb5/CompositeViews/MessagesViewTests.cs
@@ -189,8 +189,8 @@ public async Task TimeSent_is_not_cast_to_DateTimeMin_if_null()
             using (var session = DocumentStore.OpenAsyncSession())
             {
                 var query = session.Query<MessagesViewIndex.SortAndFilterOptions, MessagesViewIndex>()
-                    .ProjectInto<FailedMessage>()
-                    .Customize(x => x.WaitForNonStaleResults());
+                    .Customize(x => x.WaitForNonStaleResults())
+                    .OfType<FailedMessage>();
 
                 var messagesWithNoTimestamp = await MessagesViewTransformer.TransformToMessageView(query).ToArrayAsync();
 
@@ -233,8 +233,8 @@ public async Task Correct_status_for_failed_messages(FailedMessageStatus failedM
             using (var session = DocumentStore.OpenAsyncSession())
             {
                 var query = session.Query<FailedMessage>()
-                    .ProjectInto<FailedMessage>()
-                    .Customize(x => x.WaitForNonStaleResults());
+                    .Customize(x => x.WaitForNonStaleResults())
+                    .OfType<FailedMessage>();
 
                 var result = await MessagesViewTransformer.TransformToMessageView(query).ToListAsync();
 
@@ -276,8 +276,8 @@ public async Task Correct_status_for_repeated_errors()
             {
                 var query = session
                     .Query<FailedMessage>()
-                    .ProjectInto<FailedMessage>()
-                    .Customize(x => x.WaitForNonStaleResults());
+                    .Customize(x => x.WaitForNonStaleResults())
+                    .OfType<FailedMessage>();
 
                 var result = await MessagesViewTransformer.TransformToMessageView(query).ToListAsync();