diff --git a/src/coreservices.cpp b/src/coreservices.cpp
index 8523ee8ae99d..a0977b516d36 100644
--- a/src/coreservices.cpp
+++ b/src/coreservices.cpp
@@ -369,10 +369,6 @@ void CoreServices::initialize(QApplication* pApp) {
     qDebug() << "Creating ControllerManager";
     m_pControllerManager = std::make_shared<ControllerManager>(pConfig);
 
-    // Wait until all other ControlObjects are set up before initializing
-    // controllers
-    m_pControllerManager->setUpDevices();
-
     // Scan the library for new files and directories
     bool rescan = pConfig->getValue<bool>(
             ConfigKey("[Library]", "RescanOnStartup"));
diff --git a/src/main.cpp b/src/main.cpp
index 16849a5bf052..0fea82979b56 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,6 +7,7 @@
 #include <QtDebug>
 
 #include "config.h"
+#include "controllers/controllermanager.h"
 #include "coreservices.h"
 #include "errordialoghandler.h"
 #include "mixxxapplication.h"
@@ -57,6 +58,7 @@ int runMixxx(MixxxApplication* pApp, const CmdlineArgs& args) {
                 &MixxxMainWindow::initializationProgressUpdate);
         pCoreServices->initialize(pApp);
         mainWindow.initialize();
+        pCoreServices->getControllerManager()->setUpDevices();
 
         // If startup produced a fatal error, then don't even start the
         // Qt event loop.
diff --git a/src/qml/qmlapplication.cpp b/src/qml/qmlapplication.cpp
index 076cdcac9850..691b499c2849 100644
--- a/src/qml/qmlapplication.cpp
+++ b/src/qml/qmlapplication.cpp
@@ -3,6 +3,7 @@
 #include <QtQml/qqmlextensionplugin.h>
 
 #include "control/controlsortfiltermodel.h"
+#include "controllers/controllermanager.h"
 #include "moc_qmlapplication.cpp"
 #include "qml/asyncimageprovider.h"
 #include "qml/qmlconfigproxy.h"
@@ -86,6 +87,8 @@ QmlApplication::QmlApplication(
 
     loadQml(m_mainFilePath);
 
+    pCoreServices->getControllerManager()->setUpDevices();
+
     connect(&m_fileWatcher,
             &QFileSystemWatcher::fileChanged,
             this,