diff --git a/homeassistant/components/zha/__init__.py b/homeassistant/components/zha/__init__.py
index 8c84fe166f0..183ced37825 100644
--- a/homeassistant/components/zha/__init__.py
+++ b/homeassistant/components/zha/__init__.py
@@ -273,7 +273,7 @@ def _discover_endpoint_info(endpoint):
     for key, value in extra_info.items():
         if isinstance(value, bytes):
             try:
-                extra_info[key] = value.decode('ascii')
+                extra_info[key] = value.decode('ascii').strip()
             except UnicodeDecodeError:
                 # Unsure what the best behaviour here is. Unset the key?
                 pass