diff --git a/ui/app/components/topo-viz.js b/ui/app/components/topo-viz.js
index b01fe0315..14cb43ccb 100644
--- a/ui/app/components/topo-viz.js
+++ b/ui/app/components/topo-viz.js
@@ -63,10 +63,10 @@ export default class TopoViz extends Component {
       node,
       jobId,
       groupKey: JSON.stringify([jobId, allocation.taskGroupName]),
-      memory: allocation.resources.memory,
-      cpu: allocation.resources.cpu,
-      memoryPercent: allocation.resources.memory / node.memory,
-      cpuPercent: allocation.resources.cpu / node.cpu,
+      memory: allocation.allocatedResources.memory,
+      cpu: allocation.allocatedResources.cpu,
+      memoryPercent: allocation.allocatedResources.memory / node.memory,
+      cpuPercent: allocation.allocatedResources.cpu / node.cpu,
       isSelected: false,
     };
   }
diff --git a/ui/app/routes/topology.js b/ui/app/routes/topology.js
index 97b4f0217..84875ceae 100644
--- a/ui/app/routes/topology.js
+++ b/ui/app/routes/topology.js
@@ -19,9 +19,9 @@ export default class TopologyRoute extends Route.extend(WithForbiddenState) {
 
   model() {
     return RSVP.hash({
-      allocations: this.store.findAll('allocation'),
       jobs: this.store.findAll('job'),
-      nodes: this.store.findAll('node'),
+      allocations: this.store.query('allocation', { resources: true }),
+      nodes: this.store.query('node', { resources: true }),
     }).catch(notifyForbidden(this));
   }
 }