diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c
index decf9ae1d1..233bb6df5d 100644
--- a/src/libsystemd/sd-device/sd-device.c
+++ b/src/libsystemd/sd-device/sd-device.c
@@ -1306,6 +1306,9 @@ int device_get_device_id(sd_device *device, const char **ret) {
                                 return -ENOMEM;
                 }
 
+                if (!filename_is_valid(id))
+                        return -EINVAL;
+
                 device->device_id = TAKE_PTR(id);
         }