diff --git a/modules/ui/src/app/model/testrun-status.ts b/modules/ui/src/app/model/testrun-status.ts
index 8b2235689..b37fa12da 100644
--- a/modules/ui/src/app/model/testrun-status.ts
+++ b/modules/ui/src/app/model/testrun-status.ts
@@ -24,7 +24,7 @@ export interface TestrunStatus {
   finished: string | null;
   tests?: TestsResponse;
   report: string;
-  tags: string[];
+  tags: string[] | null;
 }
 
 export interface HistoryTestrun extends TestrunStatus {
diff --git a/modules/ui/src/app/pages/testrun/testrun.component.html b/modules/ui/src/app/pages/testrun/testrun.component.html
index fce743023..ce77cbdd6 100644
--- a/modules/ui/src/app/pages/testrun/testrun.component.html
+++ b/modules/ui/src/app/pages/testrun/testrun.component.html
@@ -41,7 +41,9 @@ <h2 class="title progress-title" tabindex="-1">
                 data.device.firmware
               }}
             </h2>
-            <span *ngIf="data.tags.length" class="toolbar-tag-container">
+            <span
+              *ngIf="data.tags && data.tags.length"
+              class="toolbar-tag-container">
               <span
                 tabindex="0"
                 class="toolbar-tag"