diff --git a/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs
index 3d483324935..a690b2a13c8 100644
--- a/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs
+++ b/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs
@@ -312,7 +312,6 @@ private static ShapedQueryExpression CreateShapedQueryExpression(IEntityType ent
                 selectExpression.ClearOrdering();
             }
 
-            // TODO: See issue #24671
             if (source.ShaperExpression is ProjectionBindingExpression projectionBindingExpression)
             {
                 var projection = selectExpression.GetProjection(projectionBindingExpression);
@@ -323,7 +322,7 @@ private static ShapedQueryExpression CreateShapedQueryExpression(IEntityType ent
 
                     translation = _sqlExpressionFactory.In(translation, selectExpression, false);
 
-                    return new ShapedQueryExpression(
+                    return source.Update(
                         _sqlExpressionFactory.Select(translation),
                         Expression.Convert(
                             new ProjectionBindingExpression(source.QueryExpression, new ProjectionMember(), typeof(bool?)),