diff --git a/src/main/java/org/springframework/data/repository/core/support/RepositoryMethodInvoker.java b/src/main/java/org/springframework/data/repository/core/support/RepositoryMethodInvoker.java
index 724696227..c06fb27a8 100644
--- a/src/main/java/org/springframework/data/repository/core/support/RepositoryMethodInvoker.java
+++ b/src/main/java/org/springframework/data/repository/core/support/RepositoryMethodInvoker.java
@@ -182,7 +182,7 @@ abstract class RepositoryMethodInvoker {
 				result = (Publisher<?>) collectToList(result);
 			}
 
-			return AwaitKt.awaitFirstOrNull(result, continuation);
+			return AwaitKt.awaitSingleOrNull(result, continuation);
 		} catch (Exception e) {
 			multicaster.notifyListeners(method, args, computeInvocationResult(invocationResultCaptor.error(e)));
 			throw e;