diff --git a/src/components/alert.js b/src/components/alert.js
index 2938cb7c70..3d967b55a9 100644
--- a/src/components/alert.js
+++ b/src/components/alert.js
@@ -33,14 +33,7 @@ import globalize from '../scripts/globalize';
             });
 
             options.buttons = items;
-
-            return dialog.show(options).then(function (result) {
-                if (result === 'ok') {
-                    return Promise.resolve();
-                }
-
-                return Promise.reject();
-            });
+            return dialog.show(options);
         }
 
         return Promise.resolve();
diff --git a/src/components/dialogHelper/dialogHelper.js b/src/components/dialogHelper/dialogHelper.js
index 69f5677cfb..b2517065ca 100644
--- a/src/components/dialogHelper/dialogHelper.js
+++ b/src/components/dialogHelper/dialogHelper.js
@@ -106,15 +106,6 @@ import '../../assets/css/scrollstyles.css';
                     tryRemoveElement(dlg);
                 }
             }
-
-            //resolve();
-            // if we just called history.back(), then use a timeout to allow the history events to fire first
-            setTimeout(() => {
-                resolve({
-                    element: dlg,
-                    closedByBack: self.closedByBack
-                });
-            }, 1);
         }
 
         dlg.addEventListener('close', onDialogClosed);
@@ -265,6 +256,7 @@ import '../../assets/css/scrollstyles.css';
             dom.addEventListener(dlg, dom.whichAnimationEvent(), onFinish, {
                 once: true
             });
+
             return;
         }
 
diff --git a/src/components/multiSelect/multiSelect.js b/src/components/multiSelect/multiSelect.js
index d6ea5b6bd4..95c23b1854 100644
--- a/src/components/multiSelect/multiSelect.js
+++ b/src/components/multiSelect/multiSelect.js
@@ -319,6 +319,7 @@ import confirm from '../confirm/confirm';
             alert({
                 text: globalize.translate('PleaseSelectTwoItems')
             });
+
             return;
         }
 
diff --git a/src/components/prompt/prompt.js b/src/components/prompt/prompt.js
index 1a919ca025..8c64274ba3 100644
--- a/src/components/prompt/prompt.js
+++ b/src/components/prompt/prompt.js
@@ -11,7 +11,6 @@ import '../../elements/emby-input/emby-input';
 import '../formdialog.css';
 import template from './prompt.template.html';
 
-/* eslint-disable indent */
 export default (() => {
     function replaceAll(str, find, replace) {
         return str.split(find).join(replace);
@@ -127,4 +126,3 @@ export default (() => {
         };
     }
 })();
-/* eslint-enable indent */
diff --git a/src/components/tvproviders/schedulesdirect.js b/src/components/tvproviders/schedulesdirect.js
index 8b386566b2..21fdeb275a 100644
--- a/src/components/tvproviders/schedulesdirect.js
+++ b/src/components/tvproviders/schedulesdirect.js
@@ -112,7 +112,7 @@ export default function (page, providerId, options) {
             providerId = result.Id;
             reload();
         }, function () {
-            Dashboard.alert({ // ApiClient.ajax() error handler
+            Dashboard.alert({
                 message: globalize.translate('ErrorSavingTvProvider')
             });
         });
diff --git a/src/controllers/dashboard/dashboard.js b/src/controllers/dashboard/dashboard.js
index 0bc88b851b..b012449291 100644
--- a/src/controllers/dashboard/dashboard.js
+++ b/src/controllers/dashboard/dashboard.js
@@ -102,9 +102,9 @@ import confirm from '../../components/confirm/confirm';
                     case 'sendmessage':
                         showSendMessageForm(btn, session);
                         break;
-
                     case 'transcodinginfo':
                         showPlaybackInfo(btn, session);
+                        break;
                 }
             });
         });
diff --git a/src/controllers/user/quickConnect/helper.js b/src/controllers/user/quickConnect/helper.js
index 54e16d72bb..3b5b364d2e 100644
--- a/src/controllers/user/quickConnect/helper.js
+++ b/src/controllers/user/quickConnect/helper.js
@@ -31,6 +31,7 @@ export const activate = () => {
             title: globalize.translate('HeaderError'),
             message: globalize.translate('DefaultErrorMessage')
         });
+
         throw e;
     });
 };
diff --git a/src/plugins/experimentalWarnings/plugin.js b/src/plugins/experimentalWarnings/plugin.js
index cae6e8b67c..563e6264f2 100644
--- a/src/plugins/experimentalWarnings/plugin.js
+++ b/src/plugins/experimentalWarnings/plugin.js
@@ -28,7 +28,7 @@ function showMessage(text, userSettingsKey, appHostFeature) {
     }
 
     userSettings.set(userSettingsKey, '1', false);
-    return alert(text).catch(() => { /* ignore exceptions */ });
+    return alert(text);
 }
 
 function showBlurayMessage() {
diff --git a/src/scripts/clientUtils.js b/src/scripts/clientUtils.js
index 291202b2e0..a7941d88c6 100644
--- a/src/scripts/clientUtils.js
+++ b/src/scripts/clientUtils.js
@@ -65,7 +65,7 @@ export async function serverAddress() {
         }));
     }).then(configs => {
         const selection = configs.find(obj => !obj.config.StartupWizardCompleted) || configs[0];
-        return Promise.resolve(selection.url);
+        return Promise.resolve(selection?.url);
     }).catch(error => {
         console.log(error);
         return Promise.resolve();