diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java
index 0ff613dc8..b516a7518 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java
@@ -223,9 +223,8 @@ public Mono<Long> count() {
 					} else {
 						return throwable;
 					}
-				}).flatMapMany(ReactiveQueryResult::rowsAsObject).map(row -> {
-					return row.getLong(TemplateUtils.SELECT_COUNT);
-				}).next();
+				}).flatMapMany(ReactiveQueryResult::rowsAsObject).map(row -> row.getLong(row.getNames().iterator().next()))
+						.next();
 			});
 		}
 
diff --git a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java
index ba6becf56..5d42f221e 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java
@@ -431,7 +431,7 @@ void count() {
 
 	@Test
 	void badCount() {
-		assertThrows(CouchbaseQueryExecutionException.class, () -> airportRepository.countBad());
+		assertThrows(NullPointerException.class, () -> airportRepository.countBad());
 	}
 
 	@Test