Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r22176ce95e49213c48454f34ddf5d29b8109f2cb -ra89d6b091874136d75a9bfbdbbc1ff00f42467b3
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 22176ce95e49213c48454f34ddf5d29b8109f2cb)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision a89d6b091874136d75a9bfbdbbc1ff00f42467b3)
@@ -8,7 +8,7 @@
 * @file    AlarmMgmt.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      26-Mar-2022
+* @date    (last)      06-Jul-2022
 *
 * @author  (original)  Sean
 * @date    (original)  04-Feb-2020
@@ -117,7 +117,7 @@
             alarmConditionIsActive[ alarm ] = TRUE;
 
             // If alarm is a DG fault, request transition to fault mode
-            if ( TRUE == ALARM_TABLE[ alarm ].alarmIsDGFault )
+            if ( ( TRUE == ALARM_TABLE[ alarm ].alarmIsDGFault ) && ( getCurrentOperationMode() != DG_MODE_SERV ) )
             {
                 requestNewOperationMode( DG_MODE_FAUL );
             }