diff --git a/frontend/src/mixins/socket.ts b/frontend/src/mixins/socket.ts
index abb95e0..f5573dd 100644
--- a/frontend/src/mixins/socket.ts
+++ b/frontend/src/mixins/socket.ts
@@ -131,10 +131,15 @@ export default defineComponent({
     methods: {
 
         endpointDisplayFunction(endpoint : string) {
-            if (endpoint) {
-                return endpoint;
-            } else {
-                return this.$t("currentEndpoint");
+            for (const [k, v] of Object.entries(this.$data.agentList)) {
+                if (endpoint) {
+                    if (endpoint === v["endpoint"] && v["friendlyname"] !== "") {
+                        return v["friendlyname"];
+                    }
+                    if (endpoint === v["endpoint"] && v["friendlyname"] === "" ) {
+                        return endpoint;
+                    }
+                }
             }
         },