diff --git a/dspace-api/src/main/java/org/dspace/subscriptions/ContentGenerator.java b/dspace-api/src/main/java/org/dspace/subscriptions/ContentGenerator.java
index 7070cb90a9..c303561434 100644
--- a/dspace-api/src/main/java/org/dspace/subscriptions/ContentGenerator.java
+++ b/dspace-api/src/main/java/org/dspace/subscriptions/ContentGenerator.java
@@ -75,7 +75,7 @@ public class ContentGenerator implements SubscriptionGenerator<IndexableObject>
     }
 
     private String generateBodyMail(Context context, List<IndexableObject> indexableObjects) {
-        if (indexableObjects == null) {
+        if (indexableObjects == null || indexableObjects.isEmpty()) {
             return EMPTY;
         }
         try {