diff --git a/client/src/app/components/rdio-scanner/rdio-scanner.service.ts b/client/src/app/components/rdio-scanner/rdio-scanner.service.ts
index 6702588..5b953f0 100644
--- a/client/src/app/components/rdio-scanner/rdio-scanner.service.ts
+++ b/client/src/app/components/rdio-scanner/rdio-scanner.service.ts
@@ -139,12 +139,6 @@ export class AppRdioScannerService implements OnDestroy {
 
         this.cleanQueue();
 
-        if (this.call && !(this.liveFeedMap && this.liveFeedMap[this.call.system] &&
-            this.liveFeedMap[this.call.system][this.call.talkgroup])) {
-
-            this.skip();
-        }
-
         this.buildGroups();
 
         this.liveFeedStore();
@@ -521,6 +515,12 @@ export class AppRdioScannerService implements OnDestroy {
         this.callQueue = this.callQueue.filter((call: RdioScannerCall) => {
             return this.liveFeedMap && this.liveFeedMap[call.system] && this.liveFeedMap[call.system][call.talkgroup];
         });
+
+        if (this.call && !(this.liveFeedMap && this.liveFeedMap[this.call.system] &&
+            this.liveFeedMap[this.call.system][this.call.talkgroup])) {
+
+            this.skip();
+        }
     }
 
     private download(call: RdioScannerCall): void {