diff --git a/tuskar_ui/api/node.py b/tuskar_ui/api/node.py
index 5864c3f12..31e967756 100644
--- a/tuskar_ui/api/node.py
+++ b/tuskar_ui/api/node.py
@@ -229,7 +229,8 @@ class Node(base.APIResourceWrapper):
                 server = servers_dict.get(n.instance_uuid, None)
                 nodes_with_instance.append(cls(n, instance=server,
                                                request=request))
-            return nodes_with_instance
+            return [cls.get(request, node.uuid)
+                    for node in nodes_with_instance]
         return [cls.get(request, node.uuid) for node in nodes]
 
     @classmethod
diff --git a/tuskar_ui/test/api_tests/node_tests.py b/tuskar_ui/test/api_tests/node_tests.py
index ea92b6a7d..2589caabc 100644
--- a/tuskar_ui/test/api_tests/node_tests.py
+++ b/tuskar_ui/test/api_tests/node_tests.py
@@ -97,9 +97,15 @@ class NodeAPITests(test.APITestCase):
         node = self.ironicclient_nodes.first()
         nodes = self.ironicclient_nodes.list()
 
-        with mock_ironicclient(node=node, nodes=nodes), mock.patch(
+        with mock_ironicclient(
+                node=node,
+                nodes=nodes
+        ), mock.patch(
             'openstack_dashboard.api.nova.server_list',
             return_value=(instances, None),
+        ), mock.patch(
+            'openstack_dashboard.api.nova.server_get',
+            return_value=instances[0],
         ):
             ret_val = api.node.Node.list(self.request)