diff --git a/services/collaboration/pkg/command/server.go b/services/collaboration/pkg/command/server.go
index f028e36ded..d8a6199ba1 100644
--- a/services/collaboration/pkg/command/server.go
+++ b/services/collaboration/pkg/command/server.go
@@ -159,7 +159,7 @@ func Server(cfg *config.Config) *cobra.Command {
 					return err
 				}
 
-				service, err := font.NewService(
+				fontService, err = font.NewService(
 					font.ServiceOptions{}.
 						WithFontFS(fontFS).
 						WithRootURI(fontServiceRootURI).
@@ -170,8 +170,6 @@ func Server(cfg *config.Config) *cobra.Command {
 				if err != nil {
 					return err
 				}
-
-				fontService = service
 			}
 
 			var notificationService notification.Service
@@ -181,15 +179,16 @@ func Server(cfg *config.Config) *cobra.Command {
 				if err != nil {
 					return err
 				}
-				service, err := notification.NewService(
+				notificationService, err = notification.NewService(
 					notification.ServiceOptions{}.
 						WithLogger(logger).
 						WithGatewaySelector(gatewaySelector).
 						WithEventPublisher(natsStream).
 						WithMachineAuthAPIKey(cfg.MachineAuthAPIKey),
 				)
-
-				notificationService = service
+				if err != nil {
+					return err
+				}
 			}
 
 			// start HTTP server
diff --git a/services/collaboration/pkg/font/service.go b/services/collaboration/pkg/font/service.go
index d6ed2ca528..20300853b2 100644
--- a/services/collaboration/pkg/font/service.go
+++ b/services/collaboration/pkg/font/service.go
@@ -89,6 +89,7 @@ func (s Service) DeleteFont(w http.ResponseWriter, r *http.Request) {
 	gatewayClient, err := s.gatewaySelector.Next()
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
+		return
 	}
 
 	_, canManage, err := collaboration.CheckPermissions(gatewayClient, r.Context(), collaboration.PermissionCollaborationManageFonts)
@@ -282,6 +283,7 @@ func (s Service) UploadFont(w http.ResponseWriter, r *http.Request) {
 	gatewayClient, err := s.gatewaySelector.Next()
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
+		return
 	}
 
 	_, canManage, err := collaboration.CheckPermissions(gatewayClient, r.Context(), collaboration.PermissionCollaborationManageFonts)
diff --git a/services/collaboration/pkg/notification/service.go b/services/collaboration/pkg/notification/service.go
index 97eff22e95..bd1bac80a3 100644
--- a/services/collaboration/pkg/notification/service.go
+++ b/services/collaboration/pkg/notification/service.go
@@ -72,6 +72,7 @@ func (s Service) HandleNotification(w http.ResponseWriter, r *http.Request) {
 	gatewayClient, err := s.gatewaySelector.Next()
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
+		return
 	}
 
 	requestUser, canManage, err := collaboration.CheckPermissions(gatewayClient, r.Context(), collaboration.PermissionCollaborationPublishNotification)
diff --git a/services/notifications/pkg/service/resource.go b/services/notifications/pkg/service/resource.go
index 3138f51ebc..6fe13fb23f 100644
--- a/services/notifications/pkg/service/resource.go
+++ b/services/notifications/pkg/service/resource.go
@@ -19,7 +19,6 @@ func (s eventsNotifier) handleResourceMention(e ocEvents.ResourceMention, eventI
 		Str("event", "Mention").
 		Str("resourceid", e.Ref.GetResourceId().GetOpaqueId()).
 		Logger()
-	_ = logger
 	gatewayClient, err := s.gatewaySelector.Next()
 	if err != nil {
 		return
diff --git a/services/settings/pkg/store/defaults/permissions.go b/services/settings/pkg/store/defaults/permissions.go
index ba81dd7914..4f80c1d124 100644
--- a/services/settings/pkg/store/defaults/permissions.go
+++ b/services/settings/pkg/store/defaults/permissions.go
@@ -86,7 +86,7 @@ func CollaborationManageFontsPermission(c settingsmsg.Permission_Constraint) *se
 	}
 }
 
-// CollaborationPublishNotificationPermission is the permission to manage fonts
+// CollaborationPublishNotificationPermission is the permission to publish collaboration notifications
 func CollaborationPublishNotificationPermission(c settingsmsg.Permission_Constraint) *settingsmsg.Setting {
 	return &settingsmsg.Setting{
 		Id:          "43e5948e-8238-41d6-9ef1-f259f00591db",