diff --git a/src/EFCore.Cosmos/Properties/CosmosStrings.Designer.cs b/src/EFCore.Cosmos/Properties/CosmosStrings.Designer.cs
index 4b50fddc488..e7f873d052b 100644
--- a/src/EFCore.Cosmos/Properties/CosmosStrings.Designer.cs
+++ b/src/EFCore.Cosmos/Properties/CosmosStrings.Designer.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 
 using System;
 using System.Reflection;
diff --git a/src/EFCore.Cosmos/Properties/CosmosStrings.resx b/src/EFCore.Cosmos/Properties/CosmosStrings.resx
index 4e4ece63670..25d1ea856dd 100644
--- a/src/EFCore.Cosmos/Properties/CosmosStrings.resx
+++ b/src/EFCore.Cosmos/Properties/CosmosStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosReadItemAndPartitionKeysExtractor.cs b/src/EFCore.Cosmos/Query/Internal/CosmosReadItemAndPartitionKeysExtractor.cs
index c0221b87e81..f3b62dec2ab 100644
--- a/src/EFCore.Cosmos/Query/Internal/CosmosReadItemAndPartitionKeysExtractor.cs
+++ b/src/EFCore.Cosmos/Query/Internal/CosmosReadItemAndPartitionKeysExtractor.cs
@@ -55,6 +55,22 @@ public virtual Expression ExtractPartitionKeysAndId(
 
         _rootAlias = rootSource.Alias;
 
+        Expression UnwrapShaperForReadItem(Expression shaper)
+        {
+            if (shaper is UnaryExpression { NodeType: ExpressionType.Convert } convert
+                && convert.Type == typeof(object))
+            {
+                shaper = convert.Operand;
+            }
+
+            while (shaper is IncludeExpression { EntityExpression: var nested })
+            {
+                shaper = nested;
+            }
+
+            return shaper;
+        }
+
         // We're going to be looking for equality comparisons on the JSON id definition properties and the partition key properties of the
         // entity type; build a dictionary where the properties are the keys, and where the values are expressions that will get populated
         // from the tree (either constants or parameters).
@@ -88,6 +104,19 @@ public virtual Expression ExtractPartitionKeysAndId(
         var allIdPropertiesSpecified =
             _jsonIdPropertyValues.Values.All(p => p is not null) && _jsonIdPropertyValues.Count > 0;
 
+        // WithPartitionKey will clear _partitionKeyPropertyValues during the lift pass below; snapshot predicate partition key
+        // comparisons first so we can avoid ReadItem when both WithPartitionKey and the predicate specify partition keys (see #38238).
+        var hadWithPartitionKey = queryCompilationContext.PartitionKeyPropertyValues.Count > 0;
+        Dictionary<IProperty, (Expression? ValueExpression, Expression? OriginalExpression)>? predicatePartitionKeySnapshot = null;
+        if (hadWithPartitionKey)
+        {
+            predicatePartitionKeySnapshot = new Dictionary<IProperty, (Expression?, Expression?)>(_partitionKeyPropertyValues);
+        }
+
+        var predicateSpecifiesPartitionKey = hadWithPartitionKey
+            && predicatePartitionKeySnapshot is not null
+            && partitionKeyProperties.Any(p => predicatePartitionKeySnapshot[p].ValueExpression is not null);
+
         // First, go over the partition key properties and lift them from the predicate to the query compilation context, as possible.
         // We do this only as long as all partition key values are provided; the moment there's a gap we stop (so if PK1 and PK3 are
         // provided but not PK2, only PK1 will be lifted out).
@@ -111,11 +140,10 @@ public virtual Expression ExtractPartitionKeysAndId(
             }
         }
 
-        // Now, attempt to also transform the query to ReadItem form; this is only possible if all JSON ID properties were compared in the
-        // predicate, and *all* partition key values are specified(in the predicate or via WithPartitionKey)
-        if (_isPredicateCompatibleWithReadItem
+        var willUseReadItemOptimization = _isPredicateCompatibleWithReadItem
             && allIdPropertiesSpecified
             && queryCompilationContext.PartitionKeyPropertyValues.Count == partitionKeyProperties.Count
+            && !predicateSpecifiesPartitionKey
             && select is
             {
                 Offset: null or SqlConstantExpression { Value: 0 },
@@ -123,8 +151,12 @@ public virtual Expression ExtractPartitionKeysAndId(
             }
             // We only transform to ReadItem if the entire document (i.e. root entity type) is being projected out.
             // Using ReadItem even when a projection is present is tracked by #34163.
-            && Unwrap(shapedQuery.ShaperExpression) is StructuralTypeShaperExpression { StructuralType: var projectedStructuralType }
-            && projectedStructuralType == _entityType)
+            && UnwrapShaperForReadItem(shapedQuery.ShaperExpression) is StructuralTypeShaperExpression { StructuralType: var projectedStructuralType }
+            && projectedStructuralType == _entityType;
+
+        // Now, attempt to also transform the query to ReadItem form; this is only possible if all JSON ID properties were compared in the
+        // predicate, and *all* partition key values are specified(in the predicate or via WithPartitionKey)
+        if (willUseReadItemOptimization)
         {
             return shapedQuery.UpdateQueryExpression(select.WithReadItemInfo(new ReadItemInfo(_jsonIdPropertyValues!)));
         }
@@ -152,22 +184,6 @@ public virtual Expression ExtractPartitionKeysAndId(
         }
 
         return shapedQuery;
-
-        Expression Unwrap(Expression shaper)
-        {
-            if (shaper is UnaryExpression { NodeType: ExpressionType.Convert } convert
-                && convert.Type == typeof(object))
-            {
-                shaper = convert.Operand;
-            }
-
-            while (shaper is IncludeExpression { EntityExpression: var nested })
-            {
-                shaper = nested;
-            }
-
-            return shaper;
-        }
     }
 
     /// <summary>
@@ -320,7 +336,7 @@ void ProcessPropertyComparison(string propertyName, SqlExpression propertyValue,
                 // call. Note that this is always considered a compatible comparison for ReadItem.
                 if (propertyName == property.GetJsonPropertyName()
                     && _partitionKeyPropertyValues.TryGetValue(property, out var previousValues)
-                    && (previousValues.ValueExpression is null || previousValues.Equals(propertyValue)))
+                    && (previousValues.ValueExpression is null || previousValues.ValueExpression.Equals(propertyValue)))
                 {
                     _partitionKeyPropertyValues[property] = (ValueExpression: propertyValue, OriginalExpression: originalExpression);
                     return;
diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryDiscriminatorInIdTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryDiscriminatorInIdTest.cs
index ea878932094..bc6ca159c05 100644
--- a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryDiscriminatorInIdTest.cs
+++ b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryDiscriminatorInIdTest.cs
@@ -445,6 +445,47 @@ FROM root c
 """);
     }
 
+    public override async Task WithPartitionKey_and_conflicting_partition_key_predicate_returns_empty()
+    {
+        await base.WithPartitionKey_and_conflicting_partition_key_predicate_returns_empty();
+
+        AssertSql(
+            """
+SELECT VALUE c
+FROM root c
+WHERE (c["$type"] IN ("SinglePartitionKeyEntity", "DerivedSinglePartitionKeyEntity") AND ((c["Id"] = "b29bced8-e1e5-420e-82d7-1c7a51703d34") AND (c["PartitionKey"] = "PK2")))
+""");
+    }
+
+    public override async Task WithPartitionKey_and_partition_key_predicate_same_local()
+    {
+        await base.WithPartitionKey_and_partition_key_predicate_same_local();
+
+        AssertSql(
+            """
+@partitionKey='PK1'
+
+SELECT VALUE c
+FROM root c
+WHERE (c["$type"] IN ("SinglePartitionKeyEntity", "DerivedSinglePartitionKeyEntity") AND ((c["Id"] = "b29bced8-e1e5-420e-82d7-1c7a51703d34") AND (c["PartitionKey"] = @partitionKey)))
+""");
+    }
+
+    public override async Task WithPartitionKey_and_partition_key_predicate_two_locals_same_value()
+    {
+        await base.WithPartitionKey_and_partition_key_predicate_two_locals_same_value();
+
+        AssertSql(
+            """
+@pkForWith='PK1'
+@pkForWhere='PK1'
+
+SELECT VALUE c
+FROM root c
+WHERE (c["$type"] IN ("SinglePartitionKeyEntity", "DerivedSinglePartitionKeyEntity") AND ((c["Id"] = "b29bced8-e1e5-420e-82d7-1c7a51703d34") AND (c["PartitionKey"] = @pkForWhere)))
+""");
+    }
+
     public override async Task ReadItem_with_WithPartitionKey_with_only_partition_key()
     {
         await base.ReadItem_with_WithPartitionKey_with_only_partition_key();
@@ -797,7 +838,12 @@ public override async Task Both_WithPartitionKey_and_predicate_comparisons_with_
     {
         await base.Both_WithPartitionKey_and_predicate_comparisons_with_same_values_with_only_partition_key_leaf();
 
-        AssertSql("""ReadItem(["PK1c"], DerivedOnlySinglePartitionKeyEntity|PK1c)""");
+        AssertSql(
+            """
+SELECT VALUE c
+FROM root c
+WHERE ((c["$type"] = "DerivedOnlySinglePartitionKeyEntity") AND (c["PartitionKey"] = "PK1c"))
+""");
     }
 
     public override async Task ReadItem_with_hierarchical_partition_key_leaf()
@@ -891,7 +937,12 @@ public override async Task ReadItem_with_WithPartitionKey_with_only_partition_ke
     {
         await base.ReadItem_with_WithPartitionKey_with_only_partition_key_leaf();
 
-        AssertSql("""ReadItem(["PK1c"], DerivedOnlySinglePartitionKeyEntity|PK1c)""");
+        AssertSql(
+            """
+SELECT VALUE c
+FROM root c
+WHERE ((c["$type"] = "DerivedOnlySinglePartitionKeyEntity") AND (c["PartitionKey"] = "PK1c"))
+""");
     }
 
     public override async Task Multiple_incompatible_predicate_comparisons_cause_no_ReadItem_leaf()
diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryNoDiscriminatorInIdTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryNoDiscriminatorInIdTest.cs
index 0a7af84e3d5..7ebdcd86237 100644
--- a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryNoDiscriminatorInIdTest.cs
+++ b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryNoDiscriminatorInIdTest.cs
@@ -275,7 +275,12 @@ public override async Task Both_WithPartitionKey_and_predicate_comparisons_with_
     {
         await base.Both_WithPartitionKey_and_predicate_comparisons_with_same_values_with_only_partition_key();
 
-        AssertSql("""ReadItem(["PK1a"], PK1a)""");
+        AssertSql(
+            """
+SELECT VALUE c
+FROM root c
+WHERE (c["PartitionKey"] = "PK1a")
+""");
     }
 
     public override async Task ReadItem_with_hierarchical_partition_key()
@@ -362,11 +367,57 @@ public override async Task ReadItem_with_WithPartitionKey()
         AssertSql("""ReadItem(["PK1"], b29bced8-e1e5-420e-82d7-1c7a51703d34)""");
     }
 
+    public override async Task WithPartitionKey_and_conflicting_partition_key_predicate_returns_empty()
+    {
+        await base.WithPartitionKey_and_conflicting_partition_key_predicate_returns_empty();
+
+        AssertSql(
+            """
+SELECT VALUE c
+FROM root c
+WHERE ((c["Id"] = "b29bced8-e1e5-420e-82d7-1c7a51703d34") AND (c["PartitionKey"] = "PK2"))
+""");
+    }
+
+    public override async Task WithPartitionKey_and_partition_key_predicate_same_local()
+    {
+        await base.WithPartitionKey_and_partition_key_predicate_same_local();
+
+        AssertSql(
+            """
+@partitionKey='PK1'
+
+SELECT VALUE c
+FROM root c
+WHERE ((c["Id"] = "b29bced8-e1e5-420e-82d7-1c7a51703d34") AND (c["PartitionKey"] = @partitionKey))
+""");
+    }
+
+    public override async Task WithPartitionKey_and_partition_key_predicate_two_locals_same_value()
+    {
+        await base.WithPartitionKey_and_partition_key_predicate_two_locals_same_value();
+
+        AssertSql(
+            """
+@pkForWith='PK1'
+@pkForWhere='PK1'
+
+SELECT VALUE c
+FROM root c
+WHERE ((c["Id"] = "b29bced8-e1e5-420e-82d7-1c7a51703d34") AND (c["PartitionKey"] = @pkForWhere))
+""");
+    }
+
     public override async Task ReadItem_with_WithPartitionKey_with_only_partition_key()
     {
         await base.ReadItem_with_WithPartitionKey_with_only_partition_key();
 
-        AssertSql("""ReadItem(["PK1a"], PK1a)""");
+        AssertSql(
+            """
+SELECT VALUE c
+FROM root c
+WHERE (c["PartitionKey"] = "PK1a")
+""");
     }
 
     public override async Task Multiple_incompatible_predicate_comparisons_cause_no_ReadItem()
@@ -673,7 +724,12 @@ public override async Task Both_WithPartitionKey_and_predicate_comparisons_with_
     {
         await base.Both_WithPartitionKey_and_predicate_comparisons_with_same_values_with_only_partition_key_leaf();
 
-        AssertSql("""ReadItem(["PK1c"], PK1c)""");
+        AssertSql(
+            """
+SELECT VALUE c
+FROM root c
+WHERE ((c["$type"] = "DerivedOnlySinglePartitionKeyEntity") AND (c["PartitionKey"] = "PK1c"))
+""");
     }
 
     public override async Task ReadItem_with_hierarchical_partition_key_leaf()
@@ -764,7 +820,12 @@ public override async Task ReadItem_with_WithPartitionKey_with_only_partition_ke
     {
         await base.ReadItem_with_WithPartitionKey_with_only_partition_key_leaf();
 
-        AssertSql("""ReadItem(["PK1c"], PK1c)""");
+        AssertSql(
+            """
+SELECT VALUE c
+FROM root c
+WHERE ((c["$type"] = "DerivedOnlySinglePartitionKeyEntity") AND (c["PartitionKey"] = "PK1c"))
+""");
     }
 
     public override async Task Multiple_incompatible_predicate_comparisons_cause_no_ReadItem_leaf()
diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryRootDiscriminatorInIdTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryRootDiscriminatorInIdTest.cs
index 23a98ca0062..98c648bd1da 100644
--- a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryRootDiscriminatorInIdTest.cs
+++ b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryRootDiscriminatorInIdTest.cs
@@ -268,7 +268,12 @@ public override async Task Both_WithPartitionKey_and_predicate_comparisons_with_
     {
         await base.Both_WithPartitionKey_and_predicate_comparisons_with_same_values_with_only_partition_key();
 
-        AssertSql("""ReadItem(["PK1a"], OnlySinglePartitionKeyEntity|PK1a)""");
+        AssertSql(
+            """
+SELECT VALUE c
+FROM root c
+WHERE (c["$type"] IN ("OnlySinglePartitionKeyEntity", "DerivedOnlySinglePartitionKeyEntity") AND (c["PartitionKey"] = "PK1a"))
+""");
     }
 
     public override async Task ReadItem_with_hierarchical_partition_key()
@@ -355,11 +360,57 @@ public override async Task ReadItem_with_WithPartitionKey()
         AssertSql("""ReadItem(["PK1"], SinglePartitionKeyEntity|b29bced8-e1e5-420e-82d7-1c7a51703d34)""");
     }
 
+    public override async Task WithPartitionKey_and_conflicting_partition_key_predicate_returns_empty()
+    {
+        await base.WithPartitionKey_and_conflicting_partition_key_predicate_returns_empty();
+
+        AssertSql(
+            """
+SELECT VALUE c
+FROM root c
+WHERE (c["$type"] IN ("SinglePartitionKeyEntity", "DerivedSinglePartitionKeyEntity") AND ((c["Id"] = "b29bced8-e1e5-420e-82d7-1c7a51703d34") AND (c["PartitionKey"] = "PK2")))
+""");
+    }
+
+    public override async Task WithPartitionKey_and_partition_key_predicate_same_local()
+    {
+        await base.WithPartitionKey_and_partition_key_predicate_same_local();
+
+        AssertSql(
+            """
+@partitionKey='PK1'
+
+SELECT VALUE c
+FROM root c
+WHERE (c["$type"] IN ("SinglePartitionKeyEntity", "DerivedSinglePartitionKeyEntity") AND ((c["Id"] = "b29bced8-e1e5-420e-82d7-1c7a51703d34") AND (c["PartitionKey"] = @partitionKey)))
+""");
+    }
+
+    public override async Task WithPartitionKey_and_partition_key_predicate_two_locals_same_value()
+    {
+        await base.WithPartitionKey_and_partition_key_predicate_two_locals_same_value();
+
+        AssertSql(
+            """
+@pkForWith='PK1'
+@pkForWhere='PK1'
+
+SELECT VALUE c
+FROM root c
+WHERE (c["$type"] IN ("SinglePartitionKeyEntity", "DerivedSinglePartitionKeyEntity") AND ((c["Id"] = "b29bced8-e1e5-420e-82d7-1c7a51703d34") AND (c["PartitionKey"] = @pkForWhere)))
+""");
+    }
+
     public override async Task ReadItem_with_WithPartitionKey_with_only_partition_key()
     {
         await base.ReadItem_with_WithPartitionKey_with_only_partition_key();
 
-        AssertSql("""ReadItem(["PK1a"], OnlySinglePartitionKeyEntity|PK1a)""");
+        AssertSql(
+            """
+SELECT VALUE c
+FROM root c
+WHERE (c["$type"] IN ("OnlySinglePartitionKeyEntity", "DerivedOnlySinglePartitionKeyEntity") AND (c["PartitionKey"] = "PK1a"))
+""");
     }
 
     public override async Task Multiple_incompatible_predicate_comparisons_cause_no_ReadItem()
@@ -668,7 +719,12 @@ public override async Task Both_WithPartitionKey_and_predicate_comparisons_with_
     {
         await base.Both_WithPartitionKey_and_predicate_comparisons_with_same_values_with_only_partition_key_leaf();
 
-        AssertSql("""ReadItem(["PK1c"], OnlySinglePartitionKeyEntity|PK1c)""");
+        AssertSql(
+            """
+SELECT VALUE c
+FROM root c
+WHERE ((c["$type"] = "DerivedOnlySinglePartitionKeyEntity") AND (c["PartitionKey"] = "PK1c"))
+""");
     }
 
     public override async Task ReadItem_with_hierarchical_partition_key_leaf()
@@ -759,7 +815,12 @@ public override async Task ReadItem_with_WithPartitionKey_with_only_partition_ke
     {
         await base.ReadItem_with_WithPartitionKey_with_only_partition_key_leaf();
 
-        AssertSql("""ReadItem(["PK1c"], OnlySinglePartitionKeyEntity|PK1c)""");
+        AssertSql(
+            """
+SELECT VALUE c
+FROM root c
+WHERE ((c["$type"] = "DerivedOnlySinglePartitionKeyEntity") AND (c["PartitionKey"] = "PK1c"))
+""");
     }
 
     public override async Task Multiple_incompatible_predicate_comparisons_cause_no_ReadItem_leaf()
diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryTest.cs
index 349b3046431..9d08fb04216 100644
--- a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryTest.cs
+++ b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryTest.cs
@@ -267,7 +267,12 @@ public override async Task Both_WithPartitionKey_and_predicate_comparisons_with_
     {
         await base.Both_WithPartitionKey_and_predicate_comparisons_with_same_values_with_only_partition_key();
 
-        AssertSql("""ReadItem(["PK1a"], PK1a)""");
+        AssertSql(
+            """
+SELECT VALUE c
+FROM root c
+WHERE (c["PartitionKey"] = "PK1a")
+""");
     }
 
     public override async Task ReadItem_with_hierarchical_partition_key()
@@ -354,11 +359,57 @@ public override async Task ReadItem_with_WithPartitionKey()
         AssertSql("""ReadItem(["PK1"], b29bced8-e1e5-420e-82d7-1c7a51703d34)""");
     }
 
+    public override async Task WithPartitionKey_and_conflicting_partition_key_predicate_returns_empty()
+    {
+        await base.WithPartitionKey_and_conflicting_partition_key_predicate_returns_empty();
+
+        AssertSql(
+            """
+SELECT VALUE c
+FROM root c
+WHERE ((c["Id"] = "b29bced8-e1e5-420e-82d7-1c7a51703d34") AND (c["PartitionKey"] = "PK2"))
+""");
+    }
+
+    public override async Task WithPartitionKey_and_partition_key_predicate_same_local()
+    {
+        await base.WithPartitionKey_and_partition_key_predicate_same_local();
+
+        AssertSql(
+            """
+@partitionKey='PK1'
+
+SELECT VALUE c
+FROM root c
+WHERE ((c["Id"] = "b29bced8-e1e5-420e-82d7-1c7a51703d34") AND (c["PartitionKey"] = @partitionKey))
+""");
+    }
+
+    public override async Task WithPartitionKey_and_partition_key_predicate_two_locals_same_value()
+    {
+        await base.WithPartitionKey_and_partition_key_predicate_two_locals_same_value();
+
+        AssertSql(
+            """
+@pkForWith='PK1'
+@pkForWhere='PK1'
+
+SELECT VALUE c
+FROM root c
+WHERE ((c["Id"] = "b29bced8-e1e5-420e-82d7-1c7a51703d34") AND (c["PartitionKey"] = @pkForWhere))
+""");
+    }
+
     public override async Task ReadItem_with_WithPartitionKey_with_only_partition_key()
     {
         await base.ReadItem_with_WithPartitionKey_with_only_partition_key();
 
-        AssertSql("""ReadItem(["PK1a"], PK1a)""");
+        AssertSql(
+            """
+SELECT VALUE c
+FROM root c
+WHERE (c["PartitionKey"] = "PK1a")
+""");
     }
 
     public override async Task Multiple_incompatible_predicate_comparisons_cause_no_ReadItem()
diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryTestBase.cs b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryTestBase.cs
index c598dcf1a64..922ac643c60 100644
--- a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryTestBase.cs
+++ b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryTestBase.cs
@@ -285,6 +285,43 @@ public virtual Task ReadItem_with_WithPartitionKey()
             ss => ss.Set<SinglePartitionKeyEntity>().Where(e => e.PartitionKey == "PK1")
                 .Where(e => e.Id == Guid.Parse("B29BCED8-E1E5-420E-82D7-1C7A51703D34")));
 
+    [Fact] // Issue #38238
+    public virtual Task WithPartitionKey_and_conflicting_partition_key_predicate_returns_empty()
+        => AssertQuery(
+            async: true,
+            ss => ss.Set<SinglePartitionKeyEntity>().WithPartitionKey("PK1")
+                .Where(e => e.Id == Guid.Parse("B29BCED8-E1E5-420E-82D7-1C7A51703D34") && e.PartitionKey == "PK2"),
+            ss => ss.Set<SinglePartitionKeyEntity>().Where(e => e.PartitionKey == "PK1")
+                .Where(e => e.Id == Guid.Parse("B29BCED8-E1E5-420E-82D7-1C7A51703D34") && e.PartitionKey == "PK2"),
+            assertEmpty: true);
+
+    [Fact] // Issue #38238
+    public virtual Task WithPartitionKey_and_partition_key_predicate_same_local()
+    {
+        var partitionKey = "PK1";
+
+        return AssertQuery(
+            async: true,
+            ss => ss.Set<SinglePartitionKeyEntity>().WithPartitionKey(partitionKey)
+                .Where(e => e.Id == Guid.Parse("B29BCED8-E1E5-420E-82D7-1C7A51703D34") && e.PartitionKey == partitionKey),
+            ss => ss.Set<SinglePartitionKeyEntity>().Where(e => e.PartitionKey == partitionKey)
+                .Where(e => e.Id == Guid.Parse("B29BCED8-E1E5-420E-82D7-1C7A51703D34") && e.PartitionKey == partitionKey));
+    }
+
+    [Fact] // Issue #38238
+    public virtual Task WithPartitionKey_and_partition_key_predicate_two_locals_same_value()
+    {
+        var pkForWith = "PK1";
+        var pkForWhere = "PK1";
+
+        return AssertQuery(
+            async: true,
+            ss => ss.Set<SinglePartitionKeyEntity>().WithPartitionKey(pkForWith)
+                .Where(e => e.Id == Guid.Parse("B29BCED8-E1E5-420E-82D7-1C7A51703D34") && e.PartitionKey == pkForWhere),
+            ss => ss.Set<SinglePartitionKeyEntity>().Where(e => e.PartitionKey == pkForWith)
+                .Where(e => e.Id == Guid.Parse("B29BCED8-E1E5-420E-82D7-1C7A51703D34") && e.PartitionKey == pkForWhere));
+    }
+
     [Fact]
     public virtual Task ReadItem_with_WithPartitionKey_with_only_partition_key()
         => AssertQuery(