diff --git a/internal/broker/service.go b/internal/broker/service.go
index 53d7c46b..0367f52b 100644
--- a/internal/broker/service.go
+++ b/internal/broker/service.go
@@ -156,7 +156,11 @@ func NewService(ctx context.Context, cfg *config.Config) (s *Service, err error)
 	s.surveyor = survey.New(s.pubsub, s.cluster)
 	s.presence = presence.New(s, s.pubsub, s.surveyor, s.subscriptions)
 	if s.cluster != nil {
-		s.surveyor.HandleFunc(s.presence, ssdstore, memstore)
+		if s.storage.Name() == ssdstore.Name() {
+			s.surveyor.HandleFunc(s.presence, ssdstore)
+		} else if s.storage.Name() == memstore.Name() {
+			s.surveyor.HandleFunc(s.presence, memstore)
+		}
 	}
 
 	// Create a new cipher from the licence provided