diff --git a/src/devices/cddadevice.cpp b/src/devices/cddadevice.cpp
index 54639d41a..d8710b2b1 100644
--- a/src/devices/cddadevice.cpp
+++ b/src/devices/cddadevice.cpp
@@ -26,8 +26,7 @@ const int CddaDevice::kDiscChangePollingIntervalMs = 500;
 
 CddaDevice::CddaDevice(const QUrl& url, DeviceLister* lister,
                        const QString& unique_id, DeviceManager* manager,
-                       Application* app, int database_id, bool first_time,
-                       bool watch_for_disc_changes)
+                       Application* app, int database_id, bool first_time)
     : ConnectedDevice(url, lister, unique_id, manager, app, database_id,
                       first_time),
       cdio_(nullptr),
@@ -42,7 +41,6 @@ CddaDevice::CddaDevice(const QUrl& url, DeviceLister* lister,
   connect(this, SIGNAL(SongsDiscovered(SongList)), model_,
           SLOT(SongsDiscovered(SongList)));
   connect(&disc_changed_timer_, SIGNAL(timeout()), SLOT(CheckDiscChanged()));
-  WatchForDiscChanges(watch_for_disc_changes);
 }
 
 CddaDevice::~CddaDevice() {
@@ -57,6 +55,7 @@ bool CddaDevice::Init() {
     cdio_ = cdio_open(url_.path().toLocal8Bit().constData(), DRIVER_DEVICE);
     if (!cdio_) return false;
     LoadSongs();
+    WatchForDiscChanges(true);
   }
   return true;
 }
diff --git a/src/devices/cddadevice.h b/src/devices/cddadevice.h
index d82da07e1..0e85b6abf 100644
--- a/src/devices/cddadevice.h
+++ b/src/devices/cddadevice.h
@@ -40,8 +40,7 @@ class CddaDevice : public ConnectedDevice {
   // a valid device handle is undefined behavior and might result in crashes.
   Q_INVOKABLE CddaDevice(const QUrl& url, DeviceLister* lister,
                          const QString& unique_id, DeviceManager* manager,
-                         Application* app, int database_id, bool first_time,
-                         bool watch_for_disc_changes = true);
+                         Application* app, int database_id, bool first_time);
   ~CddaDevice();
 
   bool Init() override;