diff --git a/services/notifications/pkg/email/templates.go b/services/notifications/pkg/email/templates.go
index 85501a9a97..c0d940f3a1 100644
--- a/services/notifications/pkg/email/templates.go
+++ b/services/notifications/pkg/email/templates.go
@@ -149,6 +149,7 @@ type MessageTemplate struct {
 	CallToAction string
 }
 
+// GroupedMessageTemplate is the data structure for the email
 type GroupedMessageTemplate struct {
 	// textTemplate represent the path to text plain .tmpl file
 	textTemplate string
diff --git a/services/notifications/pkg/service/shares.go b/services/notifications/pkg/service/shares.go
index 2799e9ca57..455fa74e28 100644
--- a/services/notifications/pkg/service/shares.go
+++ b/services/notifications/pkg/service/shares.go
@@ -58,6 +58,7 @@ func (s eventsNotifier) prepareShareCreated(logger zerolog.Logger, e events.Shar
 	ctx, err = utils.GetServiceUserContextWithContext(context.Background(), gatewayClient, s.serviceAccountID, s.serviceAccountSecret)
 	if err != nil {
 		logger.Error().Err(err).Msg("could not get service user context")
+		return
 	}
 
 	resourceInfo, err := s.getResourceInfo(ctx, e.ItemID, &fieldmaskpb.FieldMask{Paths: []string{"name"}})
@@ -145,6 +146,7 @@ func (s eventsNotifier) prepareShareExpired(logger zerolog.Logger, e events.Shar
 	ctx, err = utils.GetServiceUserContextWithContext(context.Background(), gatewayClient, s.serviceAccountID, s.serviceAccountSecret)
 	if err != nil {
 		logger.Error().Err(err).Msg("could not get service user context")
+		return
 	}
 
 	resourceInfo, err := s.getResourceInfo(ctx, e.ItemID, &fieldmaskpb.FieldMask{Paths: []string{"name"}})
diff --git a/services/notifications/pkg/service/spaces.go b/services/notifications/pkg/service/spaces.go
index 9c9a7cf140..8550bd05b9 100644
--- a/services/notifications/pkg/service/spaces.go
+++ b/services/notifications/pkg/service/spaces.go
@@ -57,6 +57,7 @@ func (s eventsNotifier) prepareSpaceShared(logger zerolog.Logger, e events.Space
 	ctx, err = utils.GetServiceUserContextWithContext(context.Background(), gatewayClient, s.serviceAccountID, s.serviceAccountSecret)
 	if err != nil {
 		logger.Error().Err(err).Msg("could not get service user context")
+		return
 	}
 
 	executant, err = utils.GetUserWithContext(ctx, e.Executant, gatewayClient)
@@ -141,6 +142,7 @@ func (s eventsNotifier) prepareSpaceUnshared(logger zerolog.Logger, e events.Spa
 	ctx, err = utils.GetServiceUserContextWithContext(context.Background(), gatewayClient, s.serviceAccountID, s.serviceAccountSecret)
 	if err != nil {
 		logger.Error().Err(err).Msg("could not get service user context")
+		return
 	}
 
 	executant, err = utils.GetUserWithContext(ctx, e.Executant, gatewayClient)
diff --git a/services/notifications/pkg/service/splitter.go b/services/notifications/pkg/service/splitter.go
index e2f080ba3c..866e1860f3 100644
--- a/services/notifications/pkg/service/splitter.go
+++ b/services/notifications/pkg/service/splitter.go
@@ -12,9 +12,8 @@ import (
 )
 
 type intervalSplitter struct {
-	log                log.Logger
-	valueClient        settingssvc.ValueService
-	persistenceService userEventStore
+	log         log.Logger
+	valueClient settingssvc.ValueService
 }
 
 func newIntervalSplitter(l log.Logger, vc settingssvc.ValueService) *intervalSplitter {