diff --git a/app/notification.go b/app/notification.go
index ae04288ddd..7ddba0bdb6 100644
--- a/app/notification.go
+++ b/app/notification.go
@@ -510,6 +510,11 @@ func sendPushNotification(post *model.Post, user *model.User, channel *model.Cha
 		}
 	}
 
+	// If the post only has images then push an appropriate message
+	if len(post.Message) == 0 && post.FileIds != nil && len(post.FileIds) > 0 {
+		msg.Message = senderName + userLocale("api.post.send_notifications_and_forget.push_image_only") + channelName
+	}
+
 	l4g.Debug("Sending push notification for user %v with msg of '%v'", user.Id, msg.Message)
 
 	for _, session := range sessions {
diff --git a/i18n/en.json b/i18n/en.json
index 015a3c5785..188b5526b6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1643,6 +1643,10 @@
     "id": "api.post.send_notifications_and_forget.push_non_mention",
     "translation": " posted in "
   },
+  {
+    "id": "api.post.send_notifications_and_forget.push_image_only",
+    "translation": " Uploaded one or more files "
+  },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
     "translation": "Failed to send push device_id={{.DeviceId}}, err={{.Error}}"