diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index cd25c979..ab73969d 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -358,7 +358,7 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
       currentScreen = std::make_unique<Screens::HeartRate>(this, heartRateController, *systemTask);
       break;
     case Apps::Metronome:
-      currentScreen = std::make_unique<Screens::Metronome>(this, motorController, systemTask);
+      currentScreen = std::make_unique<Screens::Metronome>(this, motorController, *systemTask);
       break;
     case Apps::Motion:
       currentScreen = std::make_unique<Screens::Motion>(this, motionController);
diff --git a/src/displayapp/screens/Metronome.cpp b/src/displayapp/screens/Metronome.cpp
index c536e301..7bfbccb7 100644
--- a/src/displayapp/screens/Metronome.cpp
+++ b/src/displayapp/screens/Metronome.cpp
@@ -89,7 +89,7 @@ Metronome::Metronome(DisplayApp* app, Controllers::MotorController& motorControl
 
 Metronome::~Metronome() {
   app->SetTouchMode(DisplayApp::TouchModes::Gestures);
-  systemTask.PushMessage(Pinetime::System::SystemTask::Messages::EnableSleeping);
+  systemTask.PushMessage(System::Messages::EnableSleeping);
   lv_obj_clean(lv_scr_act());
 }
 
@@ -151,12 +151,12 @@ void Metronome::OnEvent(lv_obj_t* obj, lv_event_t event) {
         switch (currentState) {
           case States::Stopped: {
             lv_label_set_text(playPauseLabel, Symbols::play);
-            systemTask.PushMessage(Pinetime::System::SystemTask::Messages::EnableSleeping);
+            systemTask.PushMessage(System::Messages::EnableSleeping);
             break;
           }
           case States::Running: {
             lv_label_set_text(playPauseLabel, Symbols::pause);
-            systemTask.PushMessage(Pinetime::System::SystemTask::Messages::DisableSleeping);
+            systemTask.PushMessage(System::Messages::DisableSleeping);
             startTime = xTaskGetTickCount();
             counter = 1;
             break;