diff --git a/src/app/service-graph/components/fine-grained/fine-grained.component.scss b/src/app/service-graph/components/fine-grained/fine-grained.component.scss
index 425b1bf..56abd53 100644
--- a/src/app/service-graph/components/fine-grained/fine-grained.component.scss
+++ b/src/app/service-graph/components/fine-grained/fine-grained.component.scss
@@ -3,10 +3,11 @@
 
 xos-fine-grained-tenancy-graph {
   display: block;
+  height: 100%;
   // background: $color-accent;
 
   svg {
-    height: 800px;
+    height: 100%;
     width: 100%;
     background-color: $panel-filled-bg;
     border-radius: 3px;
diff --git a/src/app/service-graph/services/graph.store.ts b/src/app/service-graph/services/graph.store.ts
index 0ed0960..1bb5d4c 100644
--- a/src/app/service-graph/services/graph.store.ts
+++ b/src/app/service-graph/services/graph.store.ts
@@ -253,6 +253,11 @@
       const sourceId = this.getSourceId(tenant);
       const targetId = this.getTargetId(tenant);
 
+      if (!angular.isDefined(targetId)) {
+        // if the tenant is not pointing to anything, don't draw links
+        return links;
+      }
+
       const tenantToProvider = {
         id: `${sourceId}_${tenant.d3Id}`,
         source: this.getNodeIndexById(sourceId, nodes),