Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r3fa496b611a3a84c8aaa882a1b27762c6bc0024c -rfbc4422c93a0e498520fee2333e943818ee281ef
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 3fa496b611a3a84c8aaa882a1b27762c6bc0024c)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision fbc4422c93a0e498520fee2333e943818ee281ef)
@@ -165,7 +165,7 @@
         transitionToNewOperationMode( newMode );
         currentMode = newMode;
 
-        if ( ( MODE_TREA == lastMode ) && ( currentMode != MODE_TREA ) )
+        if ( MODE_TREA == lastMode )
         {
             // If the last mode is treatment but the new mode is not treatment
             // it means the treatment is done. Get the elapsed time since the beginning of the treatment and convert it to hours to be written
@@ -219,8 +219,10 @@
             break;
     }   // End switch
 
+#ifndef _VECTORCAST_
     // Send operation status event when appropriate
     if ( ( priorSubMode != currentSubMode ) || ( priorSubState != currentSubState ) || ( prior4thLevelState != current4thLevelState ) )
+#endif
     {
         sendOperationStatusEvent();
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_MODE_CHANGE, priorSubMode, currentSubMode )