diff --git a/lib/logitech_receiver/device.py b/lib/logitech_receiver/device.py
index 4e695f9e..754c7877 100644
--- a/lib/logitech_receiver/device.py
+++ b/lib/logitech_receiver/device.py
@@ -257,7 +257,8 @@ class Device(object):
                 kind = ord(pair_info[7:8]) & 0x0F
                 self._kind = _hidpp10.DEVICE_KIND[kind]
             elif self.online and self.protocol >= 2.0:
-                self._kind = KIND_MAP[_hidpp20.get_kind(self)]
+                kind = _hidpp20.get_kind(self)
+                self._kind = KIND_MAP[kind] if kind else None
         return self._kind or '?'
 
     @property