diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index ad7cff734f..e9973f9b02 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -239,7 +239,9 @@ class messenger
 	//
 	function save_queue()
 	{
-		if ($config['email_package_size'] && $this->use_queue)
+		global $config;
+
+		if ($config['email_package_size'] && $this->use_queue && !empty($this->queue))
 		{
 			$this->queue->save();
 		}