diff --git a/resources/lib/variables.py b/resources/lib/variables.py
index 71c08eae..a8ef0e16 100644
--- a/resources/lib/variables.py
+++ b/resources/lib/variables.py
@@ -66,6 +66,9 @@ else:
     PLATFORM = "Unknown"
 
 DEVICENAME = try_decode(_ADDON.getSetting('deviceName'))
+if not DEVICENAME:
+    DEVICENAME = try_decode(xbmc.getInfoLabel('System.FriendlyName'))
+    _ADDON.setSetting('deviceName', DEVICENAME)
 DEVICENAME = DEVICENAME.replace(":", "")
 DEVICENAME = DEVICENAME.replace("/", "-")
 DEVICENAME = DEVICENAME.replace("\\", "-")
diff --git a/resources/settings.xml b/resources/settings.xml
index 11fa8bea..95c95f31 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -30,7 +30,7 @@
         <setting type="sep" text=""/>
 		<setting type="lsep" label="39008" />
 		<setting id="plexCompanion" label="39004" type="bool" default="true" />
-		<setting id="deviceName" label="30016" type="text" visible="eq(-1,true)" default="PlexKodiConnect" subsetting="true" />
+		<setting id="deviceName" label="30016" type="text" visible="eq(-1,true)" default="" subsetting="true" />
 		<setting id="companionPort" label="39005" type="number" default="3005" option="int" visible="eq(-2,true)" subsetting="true" />
 		<setting id="companionUpdatePort" label="39078" type="number" default="32412" option="int" visible="eq(-3,true)" subsetting="true" />
 		<setting type="sep" text=""/>