diff --git a/flight/Modules/System/systemmod.c b/flight/Modules/System/systemmod.c
index 879c4ac86..56f4b7820 100644
--- a/flight/Modules/System/systemmod.c
+++ b/flight/Modules/System/systemmod.c
@@ -219,6 +219,12 @@ static void objectUpdatedCb(UAVObjEvent * ev)
 		FlightStatusData flightStatus;
 		FlightStatusGet(&flightStatus);
 
+		// When this is called because of this method don't do anything
+		if (objper.Operation == OBJECTPERSISTENCE_OPERATION_ERROR ||
+			objper.Operation == OBJECTPERSISTENCE_OPERATION_COMPLETED) {
+			return;
+		}
+
 		// Execute action if disarmed
 		if(flightStatus.Armed != FLIGHTSTATUS_ARMED_DISARMED) {
 			retval = -1;