Index: firmware/App/Services/StateServices/TubeSetAutoEject.c
===================================================================
diff -u -r069dee3a2428d3c6bb281db1844a372ae6e2063a -re4eceb1ac6e8091d10e0fab49d2d5a9c5e5f1c67
--- firmware/App/Services/StateServices/TubeSetAutoEject.c	(.../TubeSetAutoEject.c)	(revision 069dee3a2428d3c6bb281db1844a372ae6e2063a)
+++ firmware/App/Services/StateServices/TubeSetAutoEject.c	(.../TubeSetAutoEject.c)	(revision e4eceb1ac6e8091d10e0fab49d2d5a9c5e5f1c67)
@@ -8,7 +8,7 @@
 * @file    TubeSetAutoEject.c
 *
 * @author  (last)      Praneeth Bunne
-* @date    (last)      11-Jun-2026
+* @date    (last)      04-Jun-2026
 *
 * @author  (original)  Praneeth Bunne
 * @date    (original)  01-May-2026
@@ -124,8 +124,8 @@
 
     if ( previousAutoEjectState != currentAutoEjectState )
     {
-        SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_SUB_STATE_CHANGE, previousAutoEjectState, currentAutoEjectState );
         previousAutoEjectState = currentAutoEjectState;
+        SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_SUB_STATE_CHANGE, previousAutoEjectState, currentAutoEjectState );
     }
 }