diff --git a/phpBB/phpbb/messenger/method/base.php b/phpBB/phpbb/messenger/method/base.php
index 0fb46b2cb3..c8c7129caf 100644
--- a/phpBB/phpbb/messenger/method/base.php
+++ b/phpBB/phpbb/messenger/method/base.php
@@ -423,7 +423,7 @@ abstract class base implements messenger_interface
 	 */
 	public function save_queue(): void
 	{
-		if ($this->use_queue && !empty($this->queue))
+		if ($this->use_queue && isset($this->queue))
 		{
 			$this->queue->save();
 		}