diff --git a/src/components/viewComponents/galleryDisplay.vue b/src/components/viewComponents/galleryDisplay.vue
index 38c90ebc..7d4b889d 100644
--- a/src/components/viewComponents/galleryDisplay.vue
+++ b/src/components/viewComponents/galleryDisplay.vue
@@ -261,6 +261,10 @@ export default {
   },
 
   beforeDestroy() {
+    // Remove global signal listener to perform a gallery refresh
+    this.$root.$off("globalUpdateCaptureList");
+    // Remove global signal listener to set the gallery folder
+    this.$root.$off("globalUpdateCaptureFolder");
     // Then we call that function here to unwatch
     if (this.unwatchStoreFunction) {
       this.unwatchStoreFunction();
diff --git a/src/components/viewComponents/streamDisplay.vue b/src/components/viewComponents/streamDisplay.vue
index 0070c92a..f6c7b71f 100644
--- a/src/components/viewComponents/streamDisplay.vue
+++ b/src/components/viewComponents/streamDisplay.vue
@@ -103,6 +103,10 @@ export default {
   },
 
   beforeDestroy: function() {
+    // Remove global signal listener to change the GPU preview state
+    this.$root.$off("globalTogglePreview");
+    // Remove global signal listener to flash the stream element
+    this.$root.$off("globalFlashStream");
     // Disconnect the size observer
     this.sizeObserver.disconnect();
   },