diff --git a/lib/towerops_web/live/device_live/show.html.heex b/lib/towerops_web/live/device_live/show.html.heex
index 779ceeec..2be53dc5 100644
--- a/lib/towerops_web/live/device_live/show.html.heex
+++ b/lib/towerops_web/live/device_live/show.html.heex
@@ -69,7 +69,12 @@
           </span>
           <%= if @agent_info.type == :cloud do %>
             <span class="inline-flex items-center gap-1 text-xs text-blue-600 dark:text-blue-400">
-              <.icon name="hero-cloud" class="h-3.5 w-3.5" /> Cloud
+              <.icon name="hero-cloud" class="h-3.5 w-3.5" />
+              <%= if @agent_info.agent_token_id do %>
+                Cloud ({@agent_info.name})
+              <% else %>
+                Cloud
+              <% end %>
             </span>
           <% else %>
             <span class="inline-flex items-center gap-1 text-xs text-green-600 dark:text-green-400">