diff --git a/src/devices/giolister.cpp b/src/devices/giolister.cpp
index 451aa5d6f..f615dfca3 100644
--- a/src/devices/giolister.cpp
+++ b/src/devices/giolister.cpp
@@ -213,9 +213,11 @@ void GioLister::VolumeAdded(GVolume* volume) {
 
   DeviceInfo info;
   info.ReadVolumeInfo(volume);
+#ifndef HAVE_AUDIOCD
   if (info.volume_root_uri.startsWith("cdda"))
     // Audio CD devices are already handled by CDDA lister
     return;
+#endif
   info.ReadDriveInfo(g_volume_get_drive(volume));
   info.ReadMountInfo(g_volume_get_mount(volume));
   if (!info.is_suitable())
@@ -248,9 +250,11 @@ void GioLister::MountAdded(GMount* mount) {
 
   DeviceInfo info;
   info.ReadVolumeInfo(g_mount_get_volume(mount));
+#ifndef HAVE_AUDIOCD
   if (info.volume_root_uri.startsWith("cdda"))
     // Audio CD devices are already handled by CDDA lister
     return;
+#endif
   info.ReadMountInfo(mount);
   info.ReadDriveInfo(g_mount_get_drive(mount));
   if (!info.is_suitable())