Index: dialin/hd/hemodialysis_device.py
===================================================================
diff -u -rd6827e997b3d9a9eb5a586505802458184e1d68e -r421e18bec8df341752541768180281f7a334304c
--- dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision d6827e997b3d9a9eb5a586505802458184e1d68e)
+++ dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 421e18bec8df341752541768180281f7a334304c)
@@ -213,12 +213,13 @@
             char, char_index = bytearray_to_byte(payload, index + i, False)
             temp_message += chr(char)
 
-        self.hd_debug_event_index = 0 if self.hd_debug_event_index == self._HD_DEBUG_EVENT_LIST_COUNT - 1 else \
-                                         self.hd_debug_event_index + 1
-
         self.hd_debug_events.insert(self.hd_debug_event_index, temp_message)
         self.hd_last_debug_event = temp_message
 
+        self.hd_debug_event_index += 1
+        if self.hd_debug_event_index == self._HD_DEBUG_EVENT_LIST_COUNT:
+            self.hd_debug_event_index = 0
+
     @publish(["hd_logged_in"])
     def hd_set_logged_in_status(self, logged_in: bool = False):
         """