diff --git a/resources/lib/clientinfo.py b/resources/lib/clientinfo.py
index 94f7d207..4479d8b9 100644
--- a/resources/lib/clientinfo.py
+++ b/resources/lib/clientinfo.py
@@ -45,6 +45,7 @@ class ClientInfo():
         if utils.settings('deviceNameOpt') == "false":
             # Use Kodi's deviceName
             deviceName = xbmc.getInfoLabel('System.FriendlyName')
+            deviceName = utils.normalize_string(deviceName)
         else:
             deviceName = utils.settings('deviceName')
             deviceName = deviceName.replace("\"", "_")