diff --git a/client/src/app/components/rdio-scanner/rdio-scanner.component.ts b/client/src/app/components/rdio-scanner/rdio-scanner.component.ts
index 88e4f8f..f204bef 100644
--- a/client/src/app/components/rdio-scanner/rdio-scanner.component.ts
+++ b/client/src/app/components/rdio-scanner/rdio-scanner.component.ts
@@ -659,8 +659,9 @@ export class AppRdioScannerComponent implements OnDestroy, OnInit {
             }
 
             if (
-                this.call?.id !== this.callPrevious?.id &&
-                !this.callHistory.find((call: RdioScannerCall) => call?.id === this.callPrevious?.id)
+                this.callPrevious &&
+                this.callPrevious.id !== this.call.id &&
+                !this.callHistory.find((call: RdioScannerCall) => call?.id === this.callPrevious.id)
             ) {
                 this.callHistory.pop();