diff --git a/src/lib/flight_tasks/FlightTasks.cpp b/src/lib/flight_tasks/FlightTasks.cpp
index b6aacf3d69..ae57fe7fc6 100644
--- a/src/lib/flight_tasks/FlightTasks.cpp
+++ b/src/lib/flight_tasks/FlightTasks.cpp
@@ -82,7 +82,7 @@ FlightTaskError FlightTasks::switchTask(FlightTaskIndex new_task_index)
 		return FlightTaskError::InvalidTask;
 	}
 
-	if (!_current_task.task) {
+	if (!isAnyTaskActive()) {
 		// no task running
 		return FlightTaskError::NoError;
 	}
@@ -132,7 +132,7 @@ const char *FlightTasks::errorToString(const FlightTaskError error)
 
 void FlightTasks::reActivate()
 {
-	if (_current_task.task) {
+	if (isAnyTaskActive()) {
 		_current_task.task->reActivate();
 	}
 }