diff --git a/client/src/views/notification/badge.js b/client/src/views/notification/badge.js
index 52dc8d2a32..3410815ef5 100644
--- a/client/src/views/notification/badge.js
+++ b/client/src/views/notification/badge.js
@@ -50,7 +50,9 @@ Espo.define('views/notification/badge', 'view', function (Dep) {
         },
 
         setup: function () {
-            this.soundPath = this.getConfig().get('notificationSound') || this.soundPath;
+            this.soundPath = this.getBasePath() + (this.getConfig().get('notificationSound') || this.soundPath);
+
+            this.notificationSoundsDisabled = this.getConfig().get('notificationSoundsDisabled');
 
             this.once('remove', function () {
                 if (this.timeout) {
@@ -105,6 +107,8 @@ Espo.define('views/notification/badge', 'view', function (Dep) {
         },
 
         playSound: function () {
+            if (this.notificationSoundsDisabled) return;
+
             var html = '' +
                 '<audio autoplay="autoplay">'+
                     '<source src="' + this.soundPath + '.mp3" type="audio/mpeg" />'+
diff --git a/client/src/views/popup-notification.js b/client/src/views/popup-notification.js
index 2401f984f8..9c76939188 100644
--- a/client/src/views/popup-notification.js
+++ b/client/src/views/popup-notification.js
@@ -48,6 +48,8 @@ Espo.define('views/popup-notification', 'view', function (Dep) {
 
             this.notificationSoundsDisabled = this.getConfig().get('notificationSoundsDisabled');
 
+            this.soundPath = this.getBasePath() + (this.getConfig().get('popupNotificationSound') || this.soundPath);
+
             this.on('render', function () {
                 $(containerSelector).remove();