--- deviceactions/kaffeine_play_audiocd.desktop
+++ deviceactions/kaffeine_play_audiocd.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Actions=PlayAudioCd;
-X-KDE-Solid-Predicate=OpticalDisc.availableContent & 'Audio'
+X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Audio' ]
 
 [Desktop Action PlayAudioCd]
 Name=Play Audio CD with Kaffeine
--- deviceactions/kaffeine_play_dvd.desktop
+++ deviceactions/kaffeine_play_dvd.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Actions=PlayDVD;
-X-KDE-Solid-Predicate=OpticalDisc.availableContent & 'VideoDvd'
+X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'VideoDvd' ]
 
 [Desktop Action PlayDVD]
 Name=Play DVD with Kaffeine
--- deviceactions/kaffeine_play_videocd.desktop
+++ deviceactions/kaffeine_play_videocd.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Actions=PlayVideoCd;
-X-KDE-Solid-Predicate=OpticalDisc.availableContent & 'VideoCd|SuperVideoCd'
+X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'VideoCd|SuperVideoCd' ]
 
 [Desktop Action PlayVideoCd]
 Name=Play Video CD with Kaffeine