diff --git a/src/EFCore.PG/Query/NpgsqlSqlExpressionFactory.cs b/src/EFCore.PG/Query/NpgsqlSqlExpressionFactory.cs
index 7fa8de2f0..7f668aa07 100644
--- a/src/EFCore.PG/Query/NpgsqlSqlExpressionFactory.cs
+++ b/src/EFCore.PG/Query/NpgsqlSqlExpressionFactory.cs
@@ -721,7 +721,7 @@ private SqlExpression ApplyTypeMappingOnLike(LikeExpression likeExpression)
             ApplyTypeMapping(likeExpression.Match, inferredTypeMapping),
             ApplyTypeMapping(likeExpression.Pattern, inferredTypeMapping),
             // The escape character must not inherit the match or pattern's value converter (#3888).
-            ApplyDefaultTypeMapping(likeExpression.EscapeChar),
+            likeExpression.EscapeChar is null ? null : ApplyDefaultTypeMapping(likeExpression.EscapeChar),
             _boolTypeMapping);
     }
 
@@ -734,7 +734,7 @@ private SqlExpression ApplyTypeMappingOnILike(PgILikeExpression ilikeExpression)
             ApplyTypeMapping(ilikeExpression.Match, inferredTypeMapping),
             ApplyTypeMapping(ilikeExpression.Pattern, inferredTypeMapping),
             // The escape character must not inherit the match or pattern's value converter (#3888).
-            ApplyDefaultTypeMapping(ilikeExpression.EscapeChar),
+            ilikeExpression.EscapeChar is null ? null : ApplyDefaultTypeMapping(ilikeExpression.EscapeChar),
             _boolTypeMapping);
     }