diff --git a/ChangeLog b/ChangeLog
index 73ca0d7..4b6d707 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
     improve denied 94 msg #24
     default fmask=0133 for vfat ntfs msdos umsdos #25
     [devmon 1.1.7] support raid /dev/mda in partition detection #28
+    fix identify empty optical drive
 0.4.1   2013-03-17:
     update Russian translation
     added translation files to transifex.com
diff --git a/src/device-info.c b/src/device-info.c
index 0fe3608..05a1bbd 100644
--- a/src/device-info.c
+++ b/src/device-info.c
@@ -1174,7 +1174,9 @@ void info_optical_disc( device_t *device )
 {
     const char *cdrom_disc_state;
 
-    if ( udev_device_get_property_value( device->udevice, "ID_CDROM_MEDIA") )
+    const char* optical_state = udev_device_get_property_value( device->udevice,
+                                                                "ID_CDROM");
+    if ( optical_state && atoi( optical_state ) != 0 )
     {
         device->device_is_optical_disc = TRUE;