diff --git a/src/components/ble/MusicService.cpp b/src/components/ble/MusicService.cpp
index 403c957b..94d97f46 100644
--- a/src/components/ble/MusicService.cpp
+++ b/src/components/ble/MusicService.cpp
@@ -16,7 +16,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 #include "components/ble/MusicService.h"
-#include "systemtask/SystemTask.h"
+#include "components/ble/NimbleController.h"
 #include <cstring>
 
 namespace {
@@ -53,7 +53,7 @@ namespace {
   }
 }
 
-Pinetime::Controllers::MusicService::MusicService(Pinetime::System::SystemTask& system) : m_system(system) {
+Pinetime::Controllers::MusicService::MusicService(Pinetime::Controllers::NimbleController& nimble) : nimble(nimble) {
   characteristicDefinition[0] = {.uuid = &msEventCharUuid.u,
                                  .access_cb = MusicCallback,
                                  .arg = this,
@@ -212,7 +212,7 @@ int Pinetime::Controllers::MusicService::getTrackLength() const {
 void Pinetime::Controllers::MusicService::event(char event) {
   auto* om = ble_hs_mbuf_from_flat(&event, 1);
 
-  uint16_t connectionHandle = m_system.nimble().connHandle();
+  uint16_t connectionHandle = nimble.connHandle();
 
   if (connectionHandle == 0 || connectionHandle == BLE_HS_CONN_HANDLE_NONE) {
     return;
diff --git a/src/components/ble/MusicService.h b/src/components/ble/MusicService.h
index 6aebc3c5..f4b902fe 100644
--- a/src/components/ble/MusicService.h
+++ b/src/components/ble/MusicService.h
@@ -27,14 +27,12 @@
 #undef min
 
 namespace Pinetime {
-  namespace System {
-    class SystemTask;
-  }
-
   namespace Controllers {
+    class NimbleController;
+
     class MusicService {
     public:
-      explicit MusicService(Pinetime::System::SystemTask& system);
+      explicit MusicService(NimbleController& nimble);
 
       void Init();
 
@@ -89,7 +87,7 @@ namespace Pinetime {
       bool repeat {false};
       bool shuffle {false};
 
-      Pinetime::System::SystemTask& m_system;
+      NimbleController& nimble;
     };
   }
 }
diff --git a/src/components/ble/NimbleController.cpp b/src/components/ble/NimbleController.cpp
index 74c8f926..7c0942fd 100644
--- a/src/components/ble/NimbleController.cpp
+++ b/src/components/ble/NimbleController.cpp
@@ -42,7 +42,7 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask,
     anService {systemTask, notificationManager},
     alertNotificationClient {systemTask, notificationManager},
     currentTimeService {dateTimeController},
-    musicService {systemTask},
+    musicService {*this},
     weatherService {systemTask, dateTimeController},
     navService {systemTask},
     batteryInformationService {batteryController},