diff --git a/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlJsonPocoTranslator.cs b/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlJsonPocoTranslator.cs
index ac06fe093..4814ff988 100644
--- a/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlJsonPocoTranslator.cs
+++ b/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlJsonPocoTranslator.cs
@@ -123,7 +123,10 @@ private SqlExpression ConvertFromText(SqlExpression expression, Type returnType)
                 return _sqlExpressionFactory.Convert(expression, returnType, _typeMappingSource.FindMapping(returnType, _model));
         }
 
-        if (unwrappedReturnType == typeof(Guid) || unwrappedReturnType == typeof(DateTimeOffset))
+        if (unwrappedReturnType == typeof(Guid)
+            || unwrappedReturnType == typeof(DateTimeOffset)
+            || unwrappedReturnType == typeof(DateOnly)
+            || unwrappedReturnType == typeof(TimeOnly))
         {
             return _sqlExpressionFactory.Convert(expression, returnType, _typeMappingSource.FindMapping(returnType, _model));
         }