diff --git a/extensions/Postgres/Postgres/Internals/PostgresDbClient.cs b/extensions/Postgres/Postgres/Internals/PostgresDbClient.cs
index 9a646842c..f45a40ae3 100644
--- a/extensions/Postgres/Postgres/Internals/PostgresDbClient.cs
+++ b/extensions/Postgres/Postgres/Internals/PostgresDbClient.cs
@@ -416,13 +416,13 @@ DO UPDATE SET
 
         // Filtering logic, including filter by similarity
         filterSql = filterSql?.Trim().Replace(PostgresSchema.PlaceholdersTags, this._colTags, StringComparison.Ordinal);
-        if (string.IsNullOrWhiteSpace(filterSql))
-        {
-            filterSql = "TRUE";
-        }
 
         var maxDistance = 1 - minSimilarity;
-        filterSql += $" AND {this._colEmbedding} <=> @embedding < @maxDistance";
+
+        var distanceFilter = $"{this._colEmbedding} <=> @embedding < @maxDistance";
+        filterSql = string.IsNullOrWhiteSpace(filterSql)
+            ? distanceFilter
+            : $"({filterSql}) AND {distanceFilter}";
 
         if (sqlUserValues == null) { sqlUserValues = []; }