diff --git a/src/main/java/org/olat/notifications/NotificationsManagerImpl.java b/src/main/java/org/olat/notifications/NotificationsManagerImpl.java
index 9db7e09efe7c12afa79248b4f9ef6f88998871f8..5597d7358d6b8a0191864d6e28aaab5653c5e77f 100644
--- a/src/main/java/org/olat/notifications/NotificationsManagerImpl.java
+++ b/src/main/java/org/olat/notifications/NotificationsManagerImpl.java
@@ -464,6 +464,10 @@ public class NotificationsManagerImpl extends NotificationsManager implements Us
 	}
 	
 	protected void updateSubscriberLatestEmail(List<Subscriber> subscribersToUpdate) {
+		if(subscribersToUpdate == null || subscribersToUpdate.isEmpty()) {
+			return;//nothing to do
+		}
+		
 		StringBuilder q = new StringBuilder();	
 		q.append("select sub from ").append(SubscriberImpl.class.getName()).append(" sub ")
 		 .append(" inner join fetch sub.publisher where sub.key in (:aKey)");