diff --git a/src/udiskslinuxdriveobject.c b/src/udiskslinuxdriveobject.c
index 71b73fe1d..62eca1238 100644
--- a/src/udiskslinuxdriveobject.c
+++ b/src/udiskslinuxdriveobject.c
@@ -258,7 +258,8 @@ udisks_linux_drive_object_constructed (GObject *_object)
   strip_and_replace_with_uscore (model);
   strip_and_replace_with_uscore (serial);
   str = g_string_new ("/org/freedesktop/UDisks2/drives/");
-  if (vendor == NULL && model == NULL && serial == NULL)
+  if ((vendor == NULL && model == NULL && serial == NULL) ||
+     （vendor == NULL && strlen (model) == 0 && strlen (serial) == 0))
     {
       g_string_append (str, "drive");
     }