diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp
index 5b3654bcde..c6e209f0f3 100644
--- a/src/modules/commander/commander.cpp
+++ b/src/modules/commander/commander.cpp
@@ -1552,7 +1552,7 @@ void *commander_low_prio_loop(void *arg)
 				mavlink_log_critical(mavlink_fd, "[cmd] parameters load ERROR");
 				tune_error();
 			}
-
+			low_prio_task = LOW_PRIO_TASK_NONE;
 			break;
 
 		case LOW_PRIO_TASK_PARAM_SAVE:
@@ -1564,37 +1564,43 @@ void *commander_low_prio_loop(void *arg)
 				mavlink_log_critical(mavlink_fd, "[cmd] parameters save error");
 				tune_error();
 			}
-
+			low_prio_task = LOW_PRIO_TASK_NONE;
 			break;
 
 		case LOW_PRIO_TASK_GYRO_CALIBRATION:
 
 			do_gyro_calibration(mavlink_fd);
+			low_prio_task = LOW_PRIO_TASK_NONE;
 			break;
 
 		case LOW_PRIO_TASK_MAG_CALIBRATION:
 
 			do_mag_calibration(mavlink_fd);
+			low_prio_task = LOW_PRIO_TASK_NONE;
 			break;
 
 		case LOW_PRIO_TASK_ALTITUDE_CALIBRATION:
 
 			// do_baro_calibration(mavlink_fd);
+			low_prio_task = LOW_PRIO_TASK_NONE;
 			break;
 
 		case LOW_PRIO_TASK_RC_CALIBRATION:
 
 			// do_rc_calibration(mavlink_fd);
+			low_prio_task = LOW_PRIO_TASK_NONE;
 			break;
 
 		case LOW_PRIO_TASK_ACCEL_CALIBRATION:
 
 			do_accel_calibration(mavlink_fd);
+			low_prio_task = LOW_PRIO_TASK_NONE;
 			break;
 
 		case LOW_PRIO_TASK_AIRSPEED_CALIBRATION:
 
 			do_airspeed_calibration(mavlink_fd);
+			low_prio_task = LOW_PRIO_TASK_NONE;
 			break;
 
 		case LOW_PRIO_TASK_NONE:
@@ -1604,8 +1610,6 @@ void *commander_low_prio_loop(void *arg)
 			break;
 		}
 
-		low_prio_task = LOW_PRIO_TASK_NONE;
-
 	}
 
 	return 0;