diff --git a/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js b/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js
index 4e498e4fd06502f269a1e0da3669c5363565aaf1..fe793bae3c703de819b14a34e938e97030c40157 100644
--- a/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js
+++ b/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js
@@ -202,7 +202,7 @@ Template.pushNotificationsFlexTab.onCreated(function() {
 				break;
 			case 'hideUnreadStatus':
 			case 'disableNotifications':
-				value = this.$('input[name='+ field +']:checked').val() ? '1' : '0';
+				value = this.$(`input[name=${ field }]:checked`).val() ? '1' : '0';
 				break;
 			default:
 				value = this.$(`input[name=${ field }]:checked`).val();
diff --git a/packages/rocketchat-push-notifications/server/models/Subscriptions.js b/packages/rocketchat-push-notifications/server/models/Subscriptions.js
index 95bdfc29c51bf1fc41c8a9b323fc2f0fc8b735e5..5a78bc87554525eb0b94e9c1cf3668a0e5b18855 100644
--- a/packages/rocketchat-push-notifications/server/models/Subscriptions.js
+++ b/packages/rocketchat-push-notifications/server/models/Subscriptions.js
@@ -84,7 +84,7 @@ RocketChat.models.Subscriptions.updateUnreadAlertById = function(_id, unreadAler
 
 RocketChat.models.Subscriptions.updateDisableNotificationsById = function(_id, disableNotifications) {
 	const query = {
-		_id: _id
+		_id
 	};
 
 	const update = {
@@ -98,7 +98,7 @@ RocketChat.models.Subscriptions.updateDisableNotificationsById = function(_id, d
 
 RocketChat.models.Subscriptions.updateHideUnreadStatusById = function(_id, hideUnreadStatus) {
 	const query = {
-		_id: _id
+		_id
 	};
 
 	const update = {