diff --git a/README.md b/README.md
index 7b88b09..0c49ebf 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Rdio Scanner v2.5
+# Rdio Scanner v2.5.1
 
 *Rdio Scanner* is a progressive web interface designed to resemble an old school radio scanner. It integrates all frontend / backend components to manage audio files from different sources.
 
diff --git a/client/package.json b/client/package.json
index b28ccc7..dd7bbbb 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "rdio-scanner-client",
-    "version": "2.5.0",
+    "version": "2.5.1",
     "private": true,
     "scripts": {
         "build": "ng build --cross-origin use-credentials --prod $*",
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 9f8b46c..c6910d7 100644
--- a/client/src/app/components/rdio-scanner/rdio-scanner.component.ts
+++ b/client/src/app/components/rdio-scanner/rdio-scanner.component.ts
@@ -242,6 +242,8 @@ export class AppRdioScannerComponent implements OnDestroy, OnInit {
                 this.unsubscribeLivefeed();
                 this.subscribeLivefeed();
             }
+
+            this.buildGroups();
         }
     }
 
@@ -279,6 +281,8 @@ export class AppRdioScannerComponent implements OnDestroy, OnInit {
                 this.unsubscribeLivefeed();
                 this.subscribeLivefeed();
             }
+
+            this.buildGroups();
         }
     }
 
@@ -467,6 +471,14 @@ export class AppRdioScannerComponent implements OnDestroy, OnInit {
     toggleGroup(name: string): void {
         const group = this.groups.find((_group) => _group.name === name);
 
+        if (this.selectionSystemHold) {
+            this._selectionSystemHold = null;
+        }
+
+        if (this.selectionTalkgroupHold) {
+            this._selectionTalkgroupHold = null;
+        }
+
         if (group) {
             const status = group.status === RdioScannerGroupStatus.On ? false : true;
 
diff --git a/package.json b/package.json
index d5b1352..0ac936e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "rdio-scanner",
-    "version": "2.5.0",
+    "version": "2.5.1",
     "private": true,
     "main": "run.js",
     "scripts": {
diff --git a/server/package.json b/server/package.json
index 5034d06..b6c420a 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "rdio-scanner-server",
-    "version": "2.5.0",
+    "version": "2.5.1",
     "private": true,
     "main": "index.js",
     "scripts": {