diff --git a/src/components/macro/macro-item/macro-item.component.ts b/src/components/macro/macro-item/macro-item.component.ts
index c559ba61..ef473c90 100644
--- a/src/components/macro/macro-item/macro-item.component.ts
+++ b/src/components/macro/macro-item/macro-item.component.ts
@@ -129,7 +129,7 @@ export class MacroItemComponent implements OnInit, OnChanges {
         }
 
         if (action.hasScancode()) {
-            const scancode: string = this.mapper.scanCodeToText(action.scancode).join(' ');
+            const scancode: string = (this.mapper.scanCodeToText(action.scancode) || [ 'Unknown' ]).join(' ');
             if (scancode) {
                 this.title += scancode;
             }
diff --git a/src/services/mapper.service.ts b/src/services/mapper.service.ts
index aafbff05..b1c76e48 100644
--- a/src/services/mapper.service.ts
+++ b/src/services/mapper.service.ts
@@ -100,7 +100,7 @@ export class MapperService {
     }
 
     public scanCodeToText(scanCode: number): string[] {
-        return this.scanCodeTextMap[scanCode] || [ 'Unknown' ];
+        return this.scanCodeTextMap[scanCode];
     }
 
     public scanCodeToSvgImagePath(scanCode: number): string {