diff --git a/MediaBrowser.Dlna/Profiles/DefaultProfile.cs b/MediaBrowser.Dlna/Profiles/DefaultProfile.cs
index a8e6b1ca69..386a4eb1e9 100644
--- a/MediaBrowser.Dlna/Profiles/DefaultProfile.cs
+++ b/MediaBrowser.Dlna/Profiles/DefaultProfile.cs
@@ -15,10 +15,9 @@ namespace MediaBrowser.Dlna.Profiles
 
             XDlnaDoc = "DMS-1.50";
 
-            FriendlyName = "Emby";
             Manufacturer = "Emby";
             ModelDescription = "Emby";
-            ModelName = "Emby";
+            ModelName = "Emby Server";
             ModelNumber = "Emby";
             ModelUrl = "http://emby.media/";
             ManufacturerUrl = "http://emby.media/";
diff --git a/MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs b/MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs
index 386370596c..c4568a2ae5 100644
--- a/MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs
+++ b/MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs
@@ -138,6 +138,11 @@ namespace MediaBrowser.Dlna.Server
 
         private string GetFriendlyName()
         {
+            if (string.IsNullOrWhiteSpace(_profile.FriendlyName))
+            {
+                return _serverName;
+            }
+
             var characters = _serverName.Where(c => (char.IsLetterOrDigit(c) || c == '-')).ToArray();
 
             var serverName = new string(characters);