diff --git a/appveyor.yml b/appveyor.yml
index 6c2d788e..82a5b665 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,8 +13,8 @@ environment:
 install:
   - set PATH=%GOPATH%\bin;c:\go\bin;%PATH%
   - rmdir c:\go /s /q
-  - appveyor DownloadFile https://storage.googleapis.com/golang/go1.16.windows-amd64.zip
-  - 7z x go1.16.windows-amd64.zip -y -oC:\ > NUL
+  - appveyor DownloadFile https://storage.googleapis.com/golang/go1.20.windows-amd64.zip
+  - 7z x go1.20.windows-amd64.zip -y -oC:\ > NUL
   - go version
 
 build_script:
diff --git a/build.bat b/build.bat
index 7ab06502..16d71320 100644
--- a/build.bat
+++ b/build.bat
@@ -12,5 +12,5 @@ goto :end
 	set GOARCH=%2
 	go tool dist install pkg/runtime
 	go install -a std
-	go build -o build/emitter-%1-%2%3 -i  -ldflags "-X github.com/emitter-io/emitter/internal/command/version.version=%APPVEYOR_BUILD_VERSION% -X github.com/emitter-io/emitter/internal/command/version.commit=%APPVEYOR_REPO_COMMIT%" .
+	go build -o build/emitter-%1-%2%3 -ldflags "-X github.com/emitter-io/emitter/internal/command/version.version=%APPVEYOR_BUILD_VERSION% -X github.com/emitter-io/emitter/internal/command/version.commit=%APPVEYOR_REPO_COMMIT%" .
 :end
\ No newline at end of file
diff --git a/internal/broker/service.go b/internal/broker/service.go
index d713d17a..8f1ad6c7 100644
--- a/internal/broker/service.go
+++ b/internal/broker/service.go
@@ -157,7 +157,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