diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilder.java
index 0a691914052..2b33c07ab5f 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilder.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/sql/SearchQueryBuilder.java
@@ -929,6 +929,11 @@ public void addSortCoordsNear(
 		String columnName = "MHD" + (myNextNearnessColumnId++);
 		mySelect.addAliasedColumn(sum, columnName);
 		mySelect.addCustomOrderings(columnName + ordering);
+		// FIXME: This is a workaround for a bug in the used SearchQueryBuilder. The grouping should be already added by
+		// the SearchQueryBuilder automatically.
+		if (mySelect.toString().contains("GROUP BY")) {
+			mySelect.addCustomGroupings(columnName);
+		}
 	}
 
 	public void addSortString(DbColumn theColumnValueNormalized, boolean theAscending) {