diff --git a/app/notification.go b/app/notification.go
index e2567bee40..65a093ee66 100644
--- a/app/notification.go
+++ b/app/notification.go
@@ -210,7 +210,7 @@ func (a *App) SendNotifications(post *model.Post, team *model.Team, channel *mod
 	}
 
 	notification := &PostNotification{
-		Post:       post,
+		Post:       post.Clone(),
 		Channel:    channel,
 		ProfileMap: profileMap,
 		Sender:     sender,
diff --git a/app/notification_push.go b/app/notification_push.go
index 83fe0b9770..c8ef59d8f1 100644
--- a/app/notification_push.go
+++ b/app/notification_push.go
@@ -583,7 +583,9 @@ func (a *App) buildFullPushNotificationMessage(contentsConfig string, post *mode
 	}
 
 	for _, attachment := range post.Attachments() {
-		post.Message += "\n" + attachment.Fallback
+		if attachment.Fallback != "" {
+			post.Message += "\n" + attachment.Fallback
+		}
 	}
 
 	userLocale := utils.GetUserTranslations(user.Locale)