diff --git a/Framework/include/QualityControl/AggregatorRunner.h b/Framework/include/QualityControl/AggregatorRunner.h
index 8ace140c90..a0e07a09ae 100644
--- a/Framework/include/QualityControl/AggregatorRunner.h
+++ b/Framework/include/QualityControl/AggregatorRunner.h
@@ -162,7 +162,7 @@ class AggregatorRunner : public framework::Task
   /// \brief Callback for CallbackService::Id::Start (DPL) a.k.a. RUN transition (FairMQ)
   void start(const framework::ServiceRegistry& services);
   /// \brief Callback for CallbackService::Id::Stop (DPL) a.k.a. STOP transition (FairMQ)
-  void stop();
+  void stop() override;
   /// \brief Callback for CallbackService::Id::Reset (DPL) a.k.a. RESET DEVICE transition (FairMQ)
   void reset();
 
diff --git a/Framework/include/QualityControl/CheckRunner.h b/Framework/include/QualityControl/CheckRunner.h
index b9d99d77c4..784c3aa8ba 100644
--- a/Framework/include/QualityControl/CheckRunner.h
+++ b/Framework/include/QualityControl/CheckRunner.h
@@ -199,7 +199,7 @@ class CheckRunner : public framework::Task
   /// \brief Callback for CallbackService::Id::Start (DPL) a.k.a. RUN transition (FairMQ)
   void start(const framework::ServiceRegistry& services);
   /// \brief Callback for CallbackService::Id::Stop (DPL) a.k.a. STOP transition (FairMQ)
-  void stop();
+  void stop() override;
   /// \brief Callback for CallbackService::Id::Reset (DPL) a.k.a. RESET DEVICE transition (FairMQ)
   void reset();
 
diff --git a/Framework/include/QualityControl/PostProcessingDevice.h b/Framework/include/QualityControl/PostProcessingDevice.h
index 1da36a7ec3..fc71e6bbd3 100644
--- a/Framework/include/QualityControl/PostProcessingDevice.h
+++ b/Framework/include/QualityControl/PostProcessingDevice.h
@@ -65,7 +65,7 @@ class PostProcessingDevice : public framework::Task
   /// \brief Callback for CallbackService::Id::Start (DPL) a.k.a. RUN transition (FairMQ)
   void start();
   /// \brief Callback for CallbackService::Id::Stop (DPL) a.k.a. STOP transition (FairMQ)
-  void stop();
+  void stop() override;
   /// \brief Callback for CallbackService::Id::Reset (DPL) a.k.a. RESET DEVICE transition (FairMQ)
   void reset();
 
diff --git a/Framework/include/QualityControl/TaskRunner.h b/Framework/include/QualityControl/TaskRunner.h
index b2380d1aa7..360d6e59b7 100644
--- a/Framework/include/QualityControl/TaskRunner.h
+++ b/Framework/include/QualityControl/TaskRunner.h
@@ -103,7 +103,7 @@ class TaskRunner : public framework::Task
   /// \brief Callback for CallbackService::Id::Start (DPL) a.k.a. RUN transition (FairMQ)
   void start(const framework::ServiceRegistry& services);
   /// \brief Callback for CallbackService::Id::Stop (DPL) a.k.a. STOP transition (FairMQ)
-  void stop();
+  void stop() override;
   /// \brief Callback for CallbackService::Id::Reset (DPL) a.k.a. RESET DEVICE transition (FairMQ)
   void reset();
 
diff --git a/Framework/src/AggregatorRunner.cxx b/Framework/src/AggregatorRunner.cxx
index 9ef7546983..4df463477b 100644
--- a/Framework/src/AggregatorRunner.cxx
+++ b/Framework/src/AggregatorRunner.cxx
@@ -113,8 +113,8 @@ void AggregatorRunner::init(framework::InitContext& iCtx)
   try {
     // registering state machine callbacks
     iCtx.services().get<CallbackService>().set(CallbackService::Id::Start, [this, &services = iCtx.services()]() { start(services); });
-    iCtx.services().get<CallbackService>().set(CallbackService::Id::Stop, [this]() { stop(); });
     iCtx.services().get<CallbackService>().set(CallbackService::Id::Reset, [this]() { reset(); });
+    iCtx.services().get<CallbackService>().set(CallbackService::Id::Stop, [this]() { stop(); });
   } catch (o2::framework::RuntimeErrorRef& ref) {
     ILOG(Error) << "Error during initialization: " << o2::framework::error_from_ref(ref).what << ENDM;
   }
diff --git a/Framework/src/CheckRunner.cxx b/Framework/src/CheckRunner.cxx
index 516225d02e..98a691caad 100644
--- a/Framework/src/CheckRunner.cxx
+++ b/Framework/src/CheckRunner.cxx
@@ -180,8 +180,8 @@ void CheckRunner::init(framework::InitContext& iCtx)
 
     // registering state machine callbacks
     iCtx.services().get<CallbackService>().set(CallbackService::Id::Start, [this, &services = iCtx.services()]() { start(services); });
-    iCtx.services().get<CallbackService>().set(CallbackService::Id::Stop, [this]() { stop(); });
     iCtx.services().get<CallbackService>().set(CallbackService::Id::Reset, [this]() { reset(); });
+    iCtx.services().get<CallbackService>().set(CallbackService::Id::Stop, [this]() { stop(); });
 
     for (auto& check : mChecks) {
       check.init();
diff --git a/Framework/src/PostProcessingDevice.cxx b/Framework/src/PostProcessingDevice.cxx
index d6417e21ac..5e10dcfc98 100644
--- a/Framework/src/PostProcessingDevice.cxx
+++ b/Framework/src/PostProcessingDevice.cxx
@@ -48,8 +48,8 @@ void PostProcessingDevice::init(framework::InitContext& ctx)
 
   // registering state machine callbacks
   ctx.services().get<CallbackService>().set(CallbackService::Id::Start, [this]() { start(); });
-  ctx.services().get<CallbackService>().set(CallbackService::Id::Stop, [this]() { stop(); });
   ctx.services().get<CallbackService>().set(CallbackService::Id::Reset, [this]() { reset(); });
+  ctx.services().get<CallbackService>().set(CallbackService::Id::Stop, [this]() { stop(); });
 }
 
 void PostProcessingDevice::run(framework::ProcessingContext& ctx)
diff --git a/Framework/src/TaskRunner.cxx b/Framework/src/TaskRunner.cxx
index 80bf6d36b7..db0172eb1a 100644
--- a/Framework/src/TaskRunner.cxx
+++ b/Framework/src/TaskRunner.cxx
@@ -84,8 +84,8 @@ void TaskRunner::init(InitContext& iCtx)
 
   // registering state machine callbacks
   iCtx.services().get<CallbackService>().set(CallbackService::Id::Start, [this, &services = iCtx.services()]() { start(services); });
-  iCtx.services().get<CallbackService>().set(CallbackService::Id::Stop, [this]() { stop(); });
   iCtx.services().get<CallbackService>().set(CallbackService::Id::Reset, [this]() { reset(); });
+  iCtx.services().get<CallbackService>().set(CallbackService::Id::Stop, [this]() { stop(); });
 
   // setup monitoring
   mCollector = MonitoringFactory::Get(mTaskConfig.monitoringUrl);