diff --git a/Firmware/src/Util/CircularBuffer.h b/Firmware/src/Util/CircularBuffer.h
index c65f85e..c879dc6 100644
--- a/Firmware/src/Util/CircularBuffer.h
+++ b/Firmware/src/Util/CircularBuffer.h
@@ -10,8 +10,8 @@ public:
   /// @brief Warning: Does not deconstruct entry! If necessary use
   /// etl::circular_buffer instead!
   T &pop() {
-    return buffer[index];
     index = (index + 1) % buffer.size();
+    return buffer[index];
   }
 
 private: