diff --git a/.eslintrc.js b/.eslintrc.js
index dc8729fb2a..e5ee2dfe86 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -49,6 +49,7 @@ module.exports = {
         'prefer-const': ['error', {'destructuring': 'all'}],
         'quotes': ['error', 'single', { 'avoidEscape': true, 'allowTemplateLiterals': false }],
         '@babel/semi': ['error'],
+        'no-var': ['error'],
         'space-before-blocks': ['error'],
         'space-infix-ops': 'error',
         'yoda': 'error'
diff --git a/src/components/focusManager.js b/src/components/focusManager.js
index 90ff8b0703..d45984bf58 100644
--- a/src/components/focusManager.js
+++ b/src/components/focusManager.js
@@ -344,8 +344,8 @@ import scrollManager from 'scrollManager';
             const midX = elementRect.left + (elementRect.width / 2);
             const midY = elementRect.top + (elementRect.height / 2);
 
-            var distX;
-            var distY;
+            let distX;
+            let distY;
 
             switch (direction) {
                 case 0:
diff --git a/src/components/htmlMediaHelper.js b/src/components/htmlMediaHelper.js
index 31fc4c29c8..be506b449d 100644
--- a/src/components/htmlMediaHelper.js
+++ b/src/components/htmlMediaHelper.js
@@ -149,7 +149,7 @@ import events from 'events';
             } else {
                 // update video player position when media is ready to be sought
                 const events = ['durationchange', 'loadeddata', 'play', 'loadedmetadata'];
-                var onMediaChange = function(e) {
+                const onMediaChange = function(e) {
                     if (element.currentTime === 0 && element.duration >= seconds) {
                         // seek only when video position is exactly zero,
                         // as this is true only if video hasn't started yet or
@@ -322,9 +322,8 @@ import events from 'events';
                         break;
                     case Hls.ErrorTypes.MEDIA_ERROR:
                         console.debug('fatal media error encountered, try to recover');
-                        var currentReject = reject;
+                        handleHlsJsMediaError(instance, reject);
                         reject = null;
-                        handleHlsJsMediaError(instance, currentReject);
                         break;
                     default:
 
diff --git a/src/components/serviceworker/notifications.js b/src/components/serviceworker/notifications.js
index cc2ee65320..51623b56f7 100644
--- a/src/components/serviceworker/notifications.js
+++ b/src/components/serviceworker/notifications.js
@@ -15,8 +15,7 @@
         return getApiClient(serverId).then(function (apiClient) {
             switch (action) {
                 case 'cancel-install':
-                    var id = data.id;
-                    return apiClient.cancelPackageInstallation(id);
+                    return apiClient.cancelPackageInstallation(data.id);
                 case 'restart':
                     return apiClient.restartServer();
                 default:
diff --git a/src/libraries/navdrawer/navdrawer.js b/src/libraries/navdrawer/navdrawer.js
index ab50ec5831..6dcf6783d1 100644
--- a/src/libraries/navdrawer/navdrawer.js
+++ b/src/libraries/navdrawer/navdrawer.js
@@ -2,6 +2,7 @@
  * and will be replaced soon by a Vue component.
  */
 
+/* eslint-disable no-var */
 import browser from 'browser';
 import dom from 'dom';
 import 'css!./navdrawer';
@@ -355,3 +356,4 @@ export default function (options) {
 
     return new TouchMenuLA();
 }
+/* eslint-enable no-var */
diff --git a/src/scripts/editorsidebar.js b/src/scripts/editorsidebar.js
index 7e8abbe2f9..3711520f02 100644
--- a/src/scripts/editorsidebar.js
+++ b/src/scripts/editorsidebar.js
@@ -254,7 +254,7 @@ import 'material-icons';
     function loadNodesToLoad(page, node) {
         const children = node.children;
         for (let i = 0, length = children.length; i < length; i++) {
-            var child = children[i];
+            const child = children[i];
             if (nodesToLoad.indexOf(child) != -1) {
                 nodesToLoad = nodesToLoad.filter(function (n) {
                     return n != child;
@@ -297,7 +297,7 @@ import 'material-icons';
         const url = window.location.hash || window.location.href;
         return getParameterByName('id', url);
     }
-    var nodesToLoad = [];
+    let nodesToLoad = [];
     let selectedNodeId;
     $(document).on('itemsaved', '.metadataEditorPage', function (e, item) {
         updateEditorNode(this, item);
diff --git a/src/scripts/gamepadtokey.js b/src/scripts/gamepadtokey.js
index 8451326974..b1976e1f6b 100644
--- a/src/scripts/gamepadtokey.js
+++ b/src/scripts/gamepadtokey.js
@@ -248,7 +248,7 @@ let inputLoopTimer;
 function runInputLoop() {
     // Get the latest gamepad state.
     const gamepads = navigator.getGamepads(); /* eslint-disable-line compat/compat */
-    for (var i = 0, len = gamepads.length; i < len; i++) {
+    for (let i = 0, len = gamepads.length; i < len; i++) {
         const gamepad = gamepads[i];
         if (!gamepad) {
             continue;
@@ -273,7 +273,7 @@ function runInputLoop() {
         }
         // Iterate through the buttons to see if Left thumbstick, DPad, A and B are pressed.
         const buttons = gamepad.buttons;
-        for (var j = 0, len = buttons.length; j < len; j++) {
+        for (let j = 0, len = buttons.length; j < len; j++) {
             if (ProcessedButtons.indexOf(j) !== -1) {
                 if (buttons[j].pressed) {
                     switch (j) {
diff --git a/src/scripts/multiDownload.js b/src/scripts/multiDownload.js
index 270c474965..6d47427ed8 100644
--- a/src/scripts/multiDownload.js
+++ b/src/scripts/multiDownload.js
@@ -10,7 +10,7 @@ function fallback(urls) {
         document.documentElement.appendChild(frame);
 
         // the download init has to be sequential otherwise IE only use the first
-        var interval = setInterval(function () {
+        const interval = setInterval(function () {
             if (frame.contentWindow.document.readyState === 'complete' || frame.contentWindow.document.readyState === 'interactive') {
                 clearInterval(interval);