diff --git a/services/wspr/internal/rpc/server/server.go b/services/wspr/internal/rpc/server/server.go
index 02e05e7..a30a728 100644
--- a/services/wspr/internal/rpc/server/server.go
+++ b/services/wspr/internal/rpc/server/server.go
@@ -393,6 +393,8 @@
 	}
 
 	select {
+	case <-s.statusClose:
+		return caveatValidationInGo(ctx, call, cavs)
 	case <-timeoutChan:
 		return makeListOfErrors(len(cavs), NewErrCaveatValidationTimeout(ctx))
 	case reply := <-replyChan: