diff --git a/backend/Database.php b/backend/Database.php
index 17b68fe0cfc242f431fd66ad44ff27a76acb6c0b..6f10deaaa55f4108de2c5cdd043ab775e5bf26ac 100644
--- a/backend/Database.php
+++ b/backend/Database.php
@@ -170,16 +170,12 @@ class Backend {
 
         $buffermap = [];
         foreach ($buffers as &$buffer) {
+            $buffer['messages'] = [];
             $buffermap[$buffer['bufferid']] = &$buffer;
-            $buffermap[$buffer['bufferid']]['messages'] = [];
         }
 
         foreach ($messages as $message) {
-            $buffer = $buffermap[$message['bufferid']];
-            $messages1 = $buffer['messages'];
-            array_push($messages1, $message);
-            $buffer['messages'] = $messages1;
-            $buffermap[$buffer['bufferid']] = $buffer;
+            array_push($buffermap[$message['bufferid']]['messages'], $message);
         }
 
         return array_values($buffermap);