diff --git a/src/components/apphost.js b/src/components/apphost.js
index eeef967eb7..27cce3dda0 100644
--- a/src/components/apphost.js
+++ b/src/components/apphost.js
@@ -75,7 +75,7 @@ function replaceAll(originalString, strReplace, strWith) {
 function generateDeviceId() {
     const keys = [];
 
-    if (keys.push(navigator.userAgent), keys.push(new Date().getTime()), window.btoa) {
+    if ((keys.push(navigator.userAgent), keys.push(new Date().getTime()), window.btoa)) {
         const result = replaceAll(btoa(keys.join('|')), '=', '1');
         return result;
     }
diff --git a/src/components/favoriteitems.js b/src/components/favoriteitems.js
index 7fd4baa5d0..72fb303522 100644
--- a/src/components/favoriteitems.js
+++ b/src/components/favoriteitems.js
@@ -141,7 +141,7 @@ import '../elements/emby-itemscontainer/emby-itemscontainer';
             let html = '';
 
             if (result.Items.length) {
-                if (html += '<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">', !layoutManager.tv && options.Limit && result.Items.length >= options.Limit) {
+                if ((html += '<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">', !layoutManager.tv && options.Limit && result.Items.length >= options.Limit)) {
                     html += '<a is="emby-linkbutton" href="' + ('#!/list.html?serverId=' + ApiClient.serverId() + '&type=' + section.types + '&IsFavorite=true') + '" class="more button-flat button-flat-mini sectionTitleTextButton">';
                     html += '<h2 class="sectionTitle sectionTitle-cards">';
                     html += globalize.translate(section.name);
diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.js b/src/components/libraryoptionseditor/libraryoptionseditor.js
index 597d747840..38760b6e5b 100644
--- a/src/components/libraryoptionseditor/libraryoptionseditor.js
+++ b/src/components/libraryoptionseditor/libraryoptionseditor.js
@@ -64,7 +64,7 @@ import template from './libraryoptionseditor.template.html';
         let html = '';
         const elem = page.querySelector('.metadataReaders');
 
-        if (plugins.length < 1) return elem.innerHTML = '', elem.classList.add('hide'), !1;
+        if (plugins.length < 1) return (elem.innerHTML = '', elem.classList.add('hide'), !1);
         html += `<h3 class="checkboxListLabel">${globalize.translate('LabelMetadataReaders')}</h3>`;
         html += '<div class="checkboxList paperList checkboxList-paperList">';
         for (let i = 0; i < plugins.length; i++) {
@@ -97,7 +97,7 @@ import template from './libraryoptionseditor.template.html';
     function renderMetadataSavers(page, metadataSavers) {
         let html = '';
         const elem = page.querySelector('.metadataSavers');
-        if (!metadataSavers.length) return elem.innerHTML = '', elem.classList.add('hide'), false;
+        if (!metadataSavers.length) return (elem.innerHTML = '', elem.classList.add('hide'), false);
         html += `<h3 class="checkboxListLabel">${globalize.translate('LabelMetadataSavers')}</h3>`;
         html += '<div class="checkboxList paperList checkboxList-paperList">';
         for (let i = 0; i < metadataSavers.length; i++) {
@@ -550,7 +550,7 @@ import template from './libraryoptionseditor.template.html';
     function getOrderedPlugins(plugins, configuredOrder) {
         plugins = plugins.slice(0);
         plugins.sort((a, b) => {
-            return a = configuredOrder.indexOf(a.Name), b = configuredOrder.indexOf(b.Name), a < b ? -1 : a > b ? 1 : 0;
+            return ((a = configuredOrder.indexOf(a.Name), b = configuredOrder.indexOf(b.Name)), a < b ? -1 : a > b ? 1 : 0);
         });
         return plugins;
     }
diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index fdb15b272e..f065a41d29 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -646,7 +646,7 @@ export default function () {
     }
 
     function bindToPlayer(context, player) {
-        if (releaseCurrentPlayer(), currentPlayer = player, player) {
+        if ((releaseCurrentPlayer(), currentPlayer = player, player)) {
             const state = playbackManager.getPlayerState(player);
             onStateChanged.call(player, {
                 type: 'init'
diff --git a/src/controllers/dashboard/metadataImages.js b/src/controllers/dashboard/metadataImages.js
index f4307ee6be..9cb2af961d 100644
--- a/src/controllers/dashboard/metadataImages.js
+++ b/src/controllers/dashboard/metadataImages.js
@@ -43,11 +43,11 @@ import Dashboard from '../../utils/dashboard';
 
     function onSubmit() {
         const form = this;
-        return loading.show(), ApiClient.getServerConfiguration().then(function(config) {
+        return (loading.show(), ApiClient.getServerConfiguration().then(function(config) {
             config.PreferredMetadataLanguage = form.querySelector('#selectLanguage').value;
             config.MetadataCountryCode = form.querySelector('#selectCountry').value;
             ApiClient.updateServerConfiguration(config).then(Dashboard.processServerConfigurationUpdateResult);
-        }), !1;
+        }), !1);
     }
 
     function getTabs() {
diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
index e64f305e97..07066201a7 100644
--- a/src/controllers/itemDetails/index.js
+++ b/src/controllers/itemDetails/index.js
@@ -1790,7 +1790,7 @@ function renderAdditionalParts(page, item, user) {
 function renderScenes(page, item) {
     let chapters = item.Chapters || [];
 
-    if (chapters.length && !chapters[0].ImageTag && (chapters = []), chapters.length) {
+    if ((chapters.length && !chapters[0].ImageTag && (chapters = []), chapters.length)) {
         page.querySelector('#scenesCollapsible').classList.remove('hide');
         const scenesContent = page.querySelector('#scenesContent');
 
diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js
index bb683b7f35..9843c2b1df 100644
--- a/src/controllers/playback/video/index.js
+++ b/src/controllers/playback/video/index.js
@@ -727,7 +727,7 @@ import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components
                         const currentTimeMs = (playbackStartTimeTicks + (positionTicks || 0)) / 1e4;
                         const programRuntimeMs = programEndDateMs - programStartDateMs;
 
-                        if (nowPlayingPositionSlider.value = getDisplayPercentByTimeOfDay(programStartDateMs, programRuntimeMs, currentTimeMs), bufferedRanges.length) {
+                        if ((nowPlayingPositionSlider.value = (getDisplayPercentByTimeOfDay(programStartDateMs, programRuntimeMs, currentTimeMs), bufferedRanges.length))) {
                             const rangeStart = getDisplayPercentByTimeOfDay(programStartDateMs, programRuntimeMs, (playbackStartTimeTicks + (bufferedRanges[0].start || 0)) / 1e4);
                             const rangeEnd = getDisplayPercentByTimeOfDay(programStartDateMs, programRuntimeMs, (playbackStartTimeTicks + (bufferedRanges[0].end || 0)) / 1e4);
                             nowPlayingPositionSlider.setBufferedRanges([{
diff --git a/src/scripts/libraryBrowser.js b/src/scripts/libraryBrowser.js
index 7f9480ddae..64a3293246 100644
--- a/src/scripts/libraryBrowser.js
+++ b/src/scripts/libraryBrowser.js
@@ -86,7 +86,7 @@ export function getQueryPagingHtml (options) {
     const recordsEnd = Math.min(startIndex + limit, totalRecordCount);
     const showControls = limit < totalRecordCount;
 
-    if (html += '<div class="listPaging">', showControls) {
+    if ((html += '<div class="listPaging">', showControls)) {
         html += '<span style="vertical-align:middle;">';
         html += globalize.translate('ListPaging', (totalRecordCount ? startIndex + 1 : 0), recordsEnd, totalRecordCount);
         html += '</span>';