diff --git a/main.cpp b/main.cpp
index 4b7bbda..9cdfd37 100644
--- a/main.cpp
+++ b/main.cpp
@@ -39,6 +39,7 @@
 #include "components/datetime/DateTimeController.h"
 #include "components/heartrate/HeartRateController.h"
 #include "components/fs/FS.h"
+#include "components/firmwarevalidator/FirmwareValidator.h"
 #include "drivers/Spi.h"
 #include "drivers/SpiMaster.h"
 #include "drivers/SpiNorFlash.h"
@@ -352,6 +353,7 @@ Pinetime::Applications::HeartRateTask heartRateApp(heartRateSensor, heartRateCon
 
 Pinetime::Controllers::FS fs {spiNorFlash};
 Pinetime::Controllers::Settings settingsController {fs};
+Pinetime::Controllers::FirmwareValidator validator;
 Pinetime::Controllers::MotorController motorController {};
 
 Pinetime::Controllers::DateTime dateTimeController {settingsController};
@@ -380,6 +382,7 @@ Pinetime::Applications::DisplayApp displayApp(lcd,
                                               notificationManager,
                                               heartRateController,
                                               settingsController,
+                                              validator,
                                               motorController,
                                               motionController,
                                               #if defined(INFINITIME_TIMERCONTROLLER)
@@ -408,6 +411,7 @@ Pinetime::System::SystemTask systemTask(spi,
                                         motionController,
                                         motionSensor,
                                         settingsController,
+                                        validator,
                                         heartRateController,
                                         displayApp,
                                         heartRateApp,
diff --git a/sim/components/firmwarevalidator/FirmwareValidator.cpp b/sim/components/firmwarevalidator/FirmwareValidator.cpp
index 63454dc..bdc5d60 100644
--- a/sim/components/firmwarevalidator/FirmwareValidator.cpp
+++ b/sim/components/firmwarevalidator/FirmwareValidator.cpp
@@ -19,3 +19,5 @@ void FirmwareValidator::Validate() {
 void FirmwareValidator::Reset() {
 //  NVIC_SystemReset();
 }
+
+void FirmwareValidator::AutoValidate() {}
diff --git a/sim/components/firmwarevalidator/FirmwareValidator.h b/sim/components/firmwarevalidator/FirmwareValidator.h
index ce644f9..90f2425 100644
--- a/sim/components/firmwarevalidator/FirmwareValidator.h
+++ b/sim/components/firmwarevalidator/FirmwareValidator.h
@@ -7,6 +7,7 @@ namespace Pinetime {
     class FirmwareValidator {
     public:
       void Validate();
+      void AutoValidate();
       bool IsValidated() const;
 
       void Reset();