diff --git a/internal/repository/notification.go b/internal/repository/notification.go
index 8298493..775e30f 100644
--- a/internal/repository/notification.go
+++ b/internal/repository/notification.go
@@ -231,6 +231,15 @@ func mapDBToDomain(db *dbgen.Notification) *domain.Notification {
 		payload = domain.NotificationPayload{}
 	}
 
+	headline := payload.Headline
+	if headline == "" {
+		headline = db.Title
+	}
+	message := payload.Message
+	if message == "" {
+		message = db.Message
+	}
+
 	var channel domain.DeliveryChannel
 	if db.Channel.Valid {
 		channel = domain.DeliveryChannel(db.Channel.String)
@@ -245,8 +254,9 @@ func mapDBToDomain(db *dbgen.Notification) *domain.Notification {
 		DeliveryChannel: channel,
 		DeliveryStatus:  domain.DeliveryStatusPending,
 		Payload: domain.NotificationPayload{
-			Headline: payload.Headline,
-			Message:  payload.Message,
+			Headline: headline,
+			Message:  message,
+			Tags:     payload.Tags,
 		},
 		IsRead:    db.IsRead,
 		Timestamp: db.CreatedAt.Time,