diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.sandbox.ts b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.sandbox.ts
index e65c599..3467207 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.sandbox.ts
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.sandbox.ts
@@ -345,12 +345,14 @@
       if (!!failureHousenumber) {
         this.appState$.dispatch(gridFailureActions.loadGridFailureAddress({ payload: failureHousenumber.uuid }));
       }
-      return;
     }
-    test$.pipe(take(1)).subscribe(addresses => {
-      const failureHousenumber: models.FailureHousenumber = addresses.find((housenumber: models.FailureHousenumber) => {
-        return housenumber.housenumber === hsnr;
-      });
+    test$.pipe(take(1)).subscribe((addresses: Array<models.FailureHousenumber>) => {
+      let failureHousenumber: models.FailureHousenumber;
+      if (!!addresses && addresses.length > 0) {
+        failureHousenumber = addresses.find((housenumber: models.FailureHousenumber) => {
+          return housenumber.housenumber === hsnr;
+        });
+      }
       if (!!failureHousenumber) {
         this.appState$.dispatch(gridFailureActions.loadGridFailureAddress({ payload: failureHousenumber.uuid }));
       }