diff --git a/bsp_hosted/scheduling.cpp b/bsp_hosted/scheduling.cpp
index 843b2892..4e9f6b8c 100644
--- a/bsp_hosted/scheduling.cpp
+++ b/bsp_hosted/scheduling.cpp
@@ -154,10 +154,11 @@ void scheduling::initTasks() {
     scheduling::printAddObjectError("Core controller dummy", objects::CORE_CONTROLLER);
   }
 
-  result = thermalTask->addComponent(objects::THERMAL_CONTROLLER);
-  if (result != returnvalue::OK) {
-    scheduling::printAddObjectError("THERMAL_CONTROLLER", objects::THERMAL_CONTROLLER);
-  }
+  // Disabled until more stable
+  //result = thermalTask->addComponent(objects::THERMAL_CONTROLLER);
+  //if (result != returnvalue::OK) {
+  //  scheduling::printAddObjectError("THERMAL_CONTROLLER", objects::THERMAL_CONTROLLER);
+  //}
 
   FixedTimeslotTaskIF* pstTask = factory->createFixedTimeslotTask(
       "DUMMY_PST", 75, PeriodicTaskIF::MINIMUM_STACK_SIZE * 4, 0.5, missedDeadlineFunc);