diff --git a/src/core/device_memory_manager.inc b/src/core/device_memory_manager.inc
index 0c22191f55..b61583d879 100644
--- a/src/core/device_memory_manager.inc
+++ b/src/core/device_memory_manager.inc
@@ -35,7 +35,7 @@ public:
         buffer.resize(8);
         const auto add_value = [&buffer](u32 value, size_t index) {
             if (buffer.size() < index + 1)
-                buffer.resize(index + 1);
+                buffer.resize(index + 8);
             buffer[index++] = value;
             return index;
         };
@@ -49,6 +49,7 @@ public:
             current = &storage[iter_entry - 1];
             index = add_value(current->value, index);
         }
+        buffer.resize(index);
     }
 
     u32 Register(u32 value) {