diff --git a/utils/eventHandler.go b/utils/eventHandler.go
index d2c74f2..a7007e2 100644
--- a/utils/eventHandler.go
+++ b/utils/eventHandler.go
@@ -65,7 +65,6 @@ func (eh *EventHandler) HandleApp(application app.Application) {
 	application.GetPrimaryBus().Subscribe(event.ACNVersion, eh.appBusQueue)
 	application.GetPrimaryBus().Subscribe(settings.UpdateGlobalSettings, eh.appBusQueue)
 	application.GetPrimaryBus().Subscribe(settings.CwtchStarted, eh.appBusQueue)
-	application.GetPrimaryBus().Subscribe(servers.UpdateServerInfo, eh.appBusQueue)
 	application.GetPrimaryBus().Subscribe(server_hosting.NewServer, eh.appBusQueue)
 	application.GetPrimaryBus().Subscribe(server_hosting.ServerIntentUpdate, eh.appBusQueue)
 	application.GetPrimaryBus().Subscribe(server_hosting.ServerDeleted, eh.appBusQueue)
@@ -574,6 +573,7 @@ func (eh *EventHandler) startHandlingPeer(onion string) {
 	eventBus.Subscribe(event.ProtocolEngineCreated, q)
 	eventBus.Subscribe(event.SearchResult, q)
 	eventBus.Subscribe(event.SearchCancelled, q)
+	eventBus.Subscribe(event.UpdateServerInfo, q)
 	go eh.forwardProfileMessages(onion, q)
 
 }