diff --git a/phpBB/phpbb/notification/method/messenger_base.php b/phpBB/phpbb/notification/method/messenger_base.php
index e4b97b7cac..7acc608cc2 100644
--- a/phpBB/phpbb/notification/method/messenger_base.php
+++ b/phpBB/phpbb/notification/method/messenger_base.php
@@ -126,16 +126,13 @@ abstract class messenger_base extends \phpbb\notification\method\base
 					], $notification->get_email_template_variables()));
 
 					$messenger_method->send();
+
+					// Save the queue in the messenger method class (has to be called or these messages could be lost)
+					$messenger_method->save_queue();
 				}
 			}
 		}
 
-		// Save the queue in the messenger method class (has to be called or these messages could be lost)
-		foreach ($messenger_collection_iterator as $messenger_method)
-		{
-			$messenger_method->save_queue();
-		}
-
 		// We're done, empty the queue
 		$this->empty_queue();
 	}