diff --git a/lib/IMAP/MailboxSync.php b/lib/IMAP/MailboxSync.php
index 9e41946fda..12961d5b6f 100644
--- a/lib/IMAP/MailboxSync.php
+++ b/lib/IMAP/MailboxSync.php
@@ -295,12 +295,16 @@ private function syncMailboxStatus(mixed $mailboxes, ?string $personalNamespace,
 		}, $syncStatus));
 		foreach ($syncStatus as $mailbox) {
 			$status = $statuses[$mailbox->getName()];
-			$mailbox->setMessages($status->getTotal());
-			$mailbox->setUnseen($status->getUnread());
+			if(isset($status)) {
+				$mailbox->setMessages($status->getTotal());
+				$mailbox->setUnseen($status->getUnread());
+			}
 		}
 		$this->atomic(function () use ($syncStatus) {
 			foreach ($syncStatus as $mailbox) {
-				$this->mailboxMapper->update($mailbox);
+				if(isset($statuses[$mailbox->getName()])) {
+					$this->mailboxMapper->update($mailbox);
+				}
 			}
 		}, $this->dbConnection);
 	}