diff --git a/resources/lib/clientinfo.py b/resources/lib/clientinfo.py
index 7fd485e3..38b2e046 100644
--- a/resources/lib/clientinfo.py
+++ b/resources/lib/clientinfo.py
@@ -62,10 +62,12 @@ class ClientInfo():
             return "iOS"
         elif xbmc.getCondVisibility('system.platform.windows'):
             return "Windows"
-        elif xbmc.getCondVisibility('system.platform.linux'):
-            return "Linux/RPi"
-        elif xbmc.getCondVisibility('system.platform.android'): 
+        elif xbmc.getCondVisibility('system.platform.android'):
             return "Linux/Android"
+        elif xbmc.getCondVisibility('system.platform.linux.raspberrypi'): 
+            return "Linux/RPi"
+        elif xbmc.getCondVisibility('system.platform.linux'): 
+            return "Linux"
         else:
             return "Unknown"
 
@@ -100,4 +102,4 @@ class ClientInfo():
         log.info("DeviceId loaded: %s" % clientId)
         window('emby_deviceId', value=clientId)
         
-        return clientId
\ No newline at end of file
+        return clientId