diff --git a/src/audio_core/device/audio_buffers.h b/src/audio_core/device/audio_buffers.h
index 25da4c8a2..9e84a9c05 100644
--- a/src/audio_core/device/audio_buffers.h
+++ b/src/audio_core/device/audio_buffers.h
@@ -146,11 +146,15 @@ public:
                 break;
             }
 
+            if (released < tags.size()) {
+                tags[released] = tag;
+            }
+
+            released++;
+
             if (released >= tags.size()) {
                 break;
             }
-
-            tags[released++] = tag;
         }
 
         return released;