diff --git a/platypush/plugins/system/__init__.py b/platypush/plugins/system/__init__.py
index 0b2c06a1..54b5d600 100644
--- a/platypush/plugins/system/__init__.py
+++ b/platypush/plugins/system/__init__.py
@@ -606,6 +606,7 @@ class SystemPlugin(SensorPlugin, EntityManager):
                     **disk,
                 )
                 for disk in entities['disks']
+                if disk.get('device')
             ],
             *[
                 NetworkInterfaceModel(