diff --git a/gui/app/components/document/sidebar-toc.js b/gui/app/components/document/sidebar-toc.js
index 16d5b7cd..c04ca99c 100644
--- a/gui/app/components/document/sidebar-toc.js
+++ b/gui/app/components/document/sidebar-toc.js
@@ -58,7 +58,7 @@ export default Component.extend({
 
 	willDestroyElement() {
 		this._super(...arguments);
-		this.eventBus.unsubscribe('documentPageAdded');
+		this.eventBus.unsubscribe('documentPageAdded', this, 'onDocumentPageAdded');
 	},
 
 	onDocumentPageAdded(pageId) {
diff --git a/gui/app/components/layout/master-sidebar.js b/gui/app/components/layout/master-sidebar.js
index c44ccb8a..260e02b3 100644
--- a/gui/app/components/layout/master-sidebar.js
+++ b/gui/app/components/layout/master-sidebar.js
@@ -79,8 +79,8 @@ export default Component.extend(Modals, {
 	willDestroyElement() {
 		this._super(...arguments);
 
-		this.eventBus.unsubscribe('notifyUser');
-		this.eventBus.unsubscribe('pinChange');
+		this.eventBus.unsubscribe('notifyUser', this, 'processNotification');
+		this.eventBus.unsubscribe('pinChange', this, 'setupPins');
 		iziToast.destroy();
 	},
 
diff --git a/gui/app/services/event-bus.js b/gui/app/services/event-bus.js
index feac591e..63672d77 100644
--- a/gui/app/services/event-bus.js
+++ b/gui/app/services/event-bus.js
@@ -13,18 +13,18 @@ import Evented from '@ember/object/evented';
 import Service from '@ember/service';
 
 export default Service.extend(Evented, {
-	init() {
-		this._super(...arguments);
-		let _this = this;
+	// init() {
+	// 	this._super(...arguments);
+	// 	let _this = this;
 
-		window.addEventListener("scroll", _.throttle(function() {
-			_this.publish('scrolled', null);
-		}, 100));
+	// 	window.addEventListener("scroll", _.throttle(function() {
+	// 		_this.publish('scrolled', null);
+	// 	}, 100));
 
-		window.addEventListener("resize", _.debounce(function() {
-			_this.publish('resized', null);
-		}, 100));
-	},
+	// 	window.addEventListener("resize", _.debounce(function() {
+	// 		_this.publish('resized', null);
+	// 	}, 100));
+	// },
 
     publish: function() {
         return this.trigger.apply(this, arguments);