diff --git a/modules/ui/src/app/mocks/progress.mock.ts b/modules/ui/src/app/mocks/progress.mock.ts
index 2911ea794..258e73c10 100644
--- a/modules/ui/src/app/mocks/progress.mock.ts
+++ b/modules/ui/src/app/mocks/progress.mock.ts
@@ -69,6 +69,7 @@ const PROGRESS_DATA_RESPONSE = (
 ) => {
   return {
     status,
+    mac_addr: '01:02:03:04:05:06',
     device: {
       manufacturer: 'Delta',
       model: '03-DIN-CPU',
diff --git a/modules/ui/src/app/mocks/reports.mock.ts b/modules/ui/src/app/mocks/reports.mock.ts
index 9a5430b5c..0cfb39420 100644
--- a/modules/ui/src/app/mocks/reports.mock.ts
+++ b/modules/ui/src/app/mocks/reports.mock.ts
@@ -3,6 +3,7 @@ import { MatTableDataSource } from '@angular/material/table';
 
 export const HISTORY = [
   {
+    mac_addr: '01:02:03:04:05:06',
     status: 'compliant',
     device: {
       manufacturer: 'Delta',
@@ -16,6 +17,7 @@ export const HISTORY = [
   },
   {
     status: 'compliant',
+    mac_addr: '01:02:03:04:05:07',
     device: {
       manufacturer: 'Delta',
       model: '03-DIN-SRC',
@@ -30,6 +32,7 @@ export const HISTORY = [
 
 export const HISTORY_AFTER_REMOVE = [
   {
+    mac_addr: '01:02:03:04:05:06',
     status: 'compliant',
     device: {
       manufacturer: 'Delta',
@@ -49,6 +52,7 @@ export const HISTORY_AFTER_REMOVE = [
 export const FORMATTED_HISTORY = [
   {
     status: 'compliant',
+    mac_addr: '01:02:03:04:05:06',
     device: {
       manufacturer: 'Delta',
       model: '03-DIN-SRC',
@@ -64,6 +68,7 @@ export const FORMATTED_HISTORY = [
   },
   {
     status: 'compliant',
+    mac_addr: '01:02:03:04:05:07',
     device: {
       manufacturer: 'Delta',
       model: '03-DIN-SRC',
diff --git a/modules/ui/src/app/model/testrun-status.ts b/modules/ui/src/app/model/testrun-status.ts
index 6e43c0344..3f6805367 100644
--- a/modules/ui/src/app/model/testrun-status.ts
+++ b/modules/ui/src/app/model/testrun-status.ts
@@ -16,6 +16,7 @@
 import { Device } from './device';
 
 export interface TestrunStatus {
+  mac_addr: string;
   status: string;
   device: IDevice;
   started: string | null;
diff --git a/modules/ui/src/app/pages/reports/history.component.ts b/modules/ui/src/app/pages/reports/history.component.ts
index f4ae52e0d..7f5dc01f1 100644
--- a/modules/ui/src/app/pages/reports/history.component.ts
+++ b/modules/ui/src/app/pages/reports/history.component.ts
@@ -164,7 +164,7 @@ export class HistoryComponent implements OnInit, OnDestroy {
 
   removeDevice(data: TestrunStatus) {
     this.store.deleteReport({
-      mac_addr: data.device.mac_addr,
+      mac_addr: data.mac_addr,
       started: data.started,
     });
     this.focusNextButton();
diff --git a/modules/ui/src/app/pages/reports/reports.store.ts b/modules/ui/src/app/pages/reports/reports.store.ts
index 23c63b86e..a457b358b 100644
--- a/modules/ui/src/app/pages/reports/reports.store.ts
+++ b/modules/ui/src/app/pages/reports/reports.store.ts
@@ -226,8 +226,7 @@ export class ReportsStore extends ComponentStore<ReportsComponentState> {
   ) {
     const history = current;
     const idx = history.findIndex(
-      report =>
-        report.device.mac_addr === mac_addr && report.started === started
+      report => report.mac_addr === mac_addr && report.started === started
     );
     if (typeof idx === 'number') {
       history.splice(idx, 1);