diff --git a/.eslintrc.js b/.eslintrc.js
index 562b457bf7..c2de8f6c69 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -52,6 +52,7 @@ module.exports = {
         'no-multi-spaces': ['error'],
         'no-multiple-empty-lines': ['error', { 'max': 1 }],
         'no-restricted-globals': ['error'].concat(restrictedGlobals),
+        'no-return-assign': ['error'],
         'no-return-await': ['error'],
         'no-sequences': ['error', { 'allowInParentheses': false }],
         'no-trailing-spaces': ['error'],
diff --git a/src/components/channelMapper/channelMapper.js b/src/components/channelMapper/channelMapper.js
index be9ff841ce..840f8bfd59 100644
--- a/src/components/channelMapper/channelMapper.js
+++ b/src/components/channelMapper/channelMapper.js
@@ -87,7 +87,8 @@ export default class channelMapper {
             html += '</div>';
             html += '</div>';
             html += `<button class="btnMap autoSize" is="paper-icon-button-light" type="button" data-id="${channel.Id}" data-providerid="${channel.ProviderChannelId}"><span class="material-icons mode_edit" aria-hidden="true"></span></button>`;
-            return html += '</div>';
+            html += '</div>';
+            return html;
         }
 
         function getEditorHtml() {
@@ -100,7 +101,8 @@ export default class channelMapper {
             html += '</div>';
             html += '</form>';
             html += '</div>';
-            return html += '</div>';
+            html += '</div>';
+            return html;
         }
 
         function initEditor(dlg, options) {
diff --git a/src/components/tunerPicker.js b/src/components/tunerPicker.js
index d31d3b5f6a..b73337182b 100644
--- a/src/components/tunerPicker.js
+++ b/src/components/tunerPicker.js
@@ -26,7 +26,8 @@ function getEditorHtml() {
     html += '<div is="emby-itemscontainer" class="results vertical-wrap">';
     html += '</div>';
     html += '</div>';
-    return html += '</div>';
+    html += '</div>';
+    return html;
 }
 
 function getDeviceHtml(device) {
@@ -61,7 +62,8 @@ function getDeviceHtml(device) {
     html += '</div>';
     html += '</div>';
     html += '</div>';
-    return html += '</button>';
+    html += '</button>';
+    return html;
 }
 
 function getTunerName(providerId) {
diff --git a/src/components/viewManager/viewManager.js b/src/components/viewManager/viewManager.js
index 48c708d2a0..03138797c9 100644
--- a/src/components/viewManager/viewManager.js
+++ b/src/components/viewManager/viewManager.js
@@ -103,9 +103,9 @@ function getViewEventDetail(view, {state, url, options = {}}, isRestored) {
     const searchParams = new URLSearchParams(url.substring(index + 1));
     const params = {};
 
-    searchParams.forEach((value, key) =>
-        params[key] = value
-    );
+    searchParams.forEach((value, key) => {
+        params[key] = value;
+    });
 
     return {
         detail: {
diff --git a/src/controllers/dashboard/apikeys.js b/src/controllers/dashboard/apikeys.js
index 300bdeb09f..9eec8503c5 100644
--- a/src/controllers/dashboard/apikeys.js
+++ b/src/controllers/dashboard/apikeys.js
@@ -37,7 +37,8 @@ import { pageIdOn } from '../../utils/dashboard';
             const date = datetime.parseISO8601Date(item.DateCreated, true);
             html += datetime.toLocaleDateString(date) + ' ' + datetime.getDisplayTime(date);
             html += '</td>';
-            return html += '</tr>';
+            html += '</tr>';
+            return html;
         }).join('');
         page.querySelector('.resultBody').innerHTML = rows;
         loading.hide();
diff --git a/src/controllers/dashboard/dlna/profile.js b/src/controllers/dashboard/dlna/profile.js
index 133faa2c8a..3f5d6c365e 100644
--- a/src/controllers/dashboard/dlna/profile.js
+++ b/src/controllers/dashboard/dlna/profile.js
@@ -149,7 +149,8 @@ import { getParameterByName } from '../../../utils/url.ts';
             li += '<h3 class="listItemBodyText">' + escapeHtml(h.Name + ' = ' + (h.Value || '')) + '</h3>';
             li += '</div>';
             li += '<button type="button" is="paper-icon-button-light" class="btnDeleteXmlAttribute listItemButton" data-index="0"><span class="material-icons delete" aria-hidden="true"></span></button>';
-            return li += '</div>';
+            li += '</div>';
+            return li;
         }).join('') + '</div>';
         const elem = $('.xmlDocumentAttributeList', page).html(html).trigger('create');
         $('.btnDeleteXmlAttribute', elem).on('click', function () {
diff --git a/src/controllers/dashboard/plugins/available/index.js b/src/controllers/dashboard/plugins/available/index.js
index 02ad0bac1a..b10518bc74 100644
--- a/src/controllers/dashboard/plugins/available/index.js
+++ b/src/controllers/dashboard/plugins/available/index.js
@@ -129,7 +129,8 @@ function getPluginHtml(plugin, options, installedPlugins) {
     html += '</div>';
     html += '</div>';
     html += '</div>';
-    return html += '</div>';
+    html += '</div>';
+    return html;
 }
 
 function getTabs() {
diff --git a/src/controllers/livetvstatus.js b/src/controllers/livetvstatus.js
index 1de366a023..d07b50c048 100644
--- a/src/controllers/livetvstatus.js
+++ b/src/controllers/livetvstatus.js
@@ -49,7 +49,8 @@ function getDeviceHtml(device) {
     html += '</div>';
     html += '</div>';
     html += '</div>';
-    return html += '</div>';
+    html += '</div>';
+    return html;
 }
 
 function renderDevices(page, devices) {
diff --git a/src/scripts/libraryBrowser.js b/src/scripts/libraryBrowser.js
index b9fe249bd4..9cb54a8c4d 100644
--- a/src/scripts/libraryBrowser.js
+++ b/src/scripts/libraryBrowser.js
@@ -115,7 +115,8 @@ export function getQueryPagingHtml (options) {
         html += '</div>';
     }
 
-    return html += '</div>';
+    html += '</div>';
+    return html;
 }
 
 export function showSortMenu (options) {