diff --git a/server/application/application.go b/server/application/application.go
index 626b2c7115..598da2e9ff 100644
--- a/server/application/application.go
+++ b/server/application/application.go
@@ -245,13 +245,13 @@ func (s *Server) ListNodes(ctx context.Context, q *application.NodeQuery) (*v1.N
 	items := make([]v1.Node, 0)
 	for _, n := range nodes {
 		cur := *n
-		hostname := cur.ObjectMeta.Labels["kubernetes.io/hostname"]
-		if !nodeRefs[hostname] {
+		nodeName := cur.ObjectMeta.Name
+		if !nodeRefs[nodeName] {
 			continue
 		}
 		items = append(items, v1.Node{
 			ObjectMeta: metav1.ObjectMeta{
-				Labels: map[string]string{"kubernetes.io/hostname": hostname},
+				Name: nodeName,
 			},
 			Status: v1.NodeStatus{
 				Capacity:    cur.Status.Capacity,
diff --git a/ui/src/app/applications/components/application-pod-view/pod-view.tsx b/ui/src/app/applications/components/application-pod-view/pod-view.tsx
index a56e56049b..ef7a340e15 100644
--- a/ui/src/app/applications/components/application-pod-view/pod-view.tsx
+++ b/ui/src/app/applications/components/application-pod-view/pod-view.tsx
@@ -254,7 +254,7 @@ export class PodView extends React.Component<PodViewProps> {
 
         if (sortMode === 'node' && initNodes) {
             initNodes.forEach(infraNode => {
-                const nodeName = infraNode.metadata ? (infraNode.metadata.labels ? infraNode.metadata.labels['kubernetes.io/hostname'] : 'Unknown') : 'Unknown';
+                const nodeName = infraNode.metadata ? infraNode.metadata.name || 'Unknown' : 'Unknown';
                 groupRefs[nodeName] = {
                     ...infraNode,
                     type: 'node',