diff --git a/.eslintrc.js b/.eslintrc.js
index 2116ee553a..4a3fec9448 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -42,9 +42,7 @@ module.exports = {
         'one-var': ["error", "never"],
         'quotes': ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": false }],
         'semi': ["error"],
-        'space-before-blocks': ["error"],
-        // Disable while it's buggy
-        'compat/compat': ["off"]
+        'space-before-blocks': ["error"]
     },
     overrides: [
         {
@@ -185,7 +183,9 @@ module.exports = {
                     'Uint32Array',
                     'Float32Array',
                     'Float64Array',
-                    'Reflect'
+                    'Reflect',
+                    // Temporary while eslint-compat-plugin is buggy
+                    'document.querySelector'
                 ]
             }
         }
diff --git a/src/components/htmlMediaHelper.js b/src/components/htmlMediaHelper.js
index 2756b6f348..fb84bc19f0 100644
--- a/src/components/htmlMediaHelper.js
+++ b/src/components/htmlMediaHelper.js
@@ -109,7 +109,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
         var now = Date.now();
 
         if (window.performance && window.performance.now) {
-            now = performance.now();
+            now = performance.now(); // eslint-disable-line compat/compat
         }
 
         if (!recoverDecodingErrorDate || (now - recoverDecodingErrorDate) > 3000) {
diff --git a/src/scripts/site.js b/src/scripts/site.js
index 7c884d73d9..c00169d224 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -399,7 +399,6 @@ var AppInfo = {};
         define('loading', [componentsPath + '/loading/loading'], returnFirstDependency);
         define('multi-download', [componentsPath + '/multidownload'], returnFirstDependency);
         define('fileDownloader', [componentsPath + '/filedownloader'], returnFirstDependency);
-        define('localassetmanager', [bowerPath + '/apiclient/localassetmanager'], returnFirstDependency);
 
         define('castSenderApiLoader', [componentsPath + '/castSenderApi'], returnFirstDependency);
     }