diff --git a/src/config/desktop-ep/create-endpoint.lua b/src/config/desktop-ep/create-endpoint.lua
index c28463fec5c972196331cb1ad3e62f57cea7e0a5..6907a6759f93e46b423c1e11b19dfdd98c3d41f0 100644
--- a/src/config/desktop-ep/create-endpoint.lua
+++ b/src/config/desktop-ep/create-endpoint.lua
@@ -12,9 +12,9 @@ session_items = {
 
 function addEndpoint (node, session_name, endpoint_type, priority)
   local id = node["bound-id"]
-  local name = node.properties['node.name']
   local media_class = node.properties['media.class']
   local session = nil
+  local name = nil
 
   -- find the session
   session = sessions_om:lookup(Interest { type = "session",
@@ -25,6 +25,12 @@ function addEndpoint (node, session_name, endpoint_type, priority)
     return
   end
 
+  -- get the endpoint name
+  name = node.properties['node.name']
+  if name == nil then
+    name = "endpoint.node." .. id
+  end
+
   -- create endpoint
   session_items.endpoints[id] = SessionItem ( endpoint_type )