diff --git a/package.json b/package.json
index 7d33448d15..7e8969556d 100644
--- a/package.json
+++ b/package.json
@@ -93,17 +93,17 @@
           "src/components/dom.js",
           "src/components/filedownloader.js",
           "src/components/filesystem.js",
+          "src/components/images/imageLoader.js",
           "src/components/input/keyboardnavigation.js",
+          "src/components/lazyloader/lazyloader-intersectionobserver.js",
           "src/components/sanatizefilename.js",
           "src/components/scrollManager.js",
-          "src/scripts/settings/appSettings.js",
-          "src/scripts/settings/userSettings.js",
-          "src/scripts/settings/webSettings.js",
           "src/scripts/dfnshelper.js",
           "src/scripts/imagehelper.js",
           "src/scripts/inputManager.js",
-          "src/components/lazyloader/lazyloader-intersectionobserver.js",
-          "src/components/images/imageLoader.js"
+          "src/scripts/settings/appSettings.js",
+          "src/scripts/settings/userSettings.js",
+          "src/scripts/settings/webSettings.js"
         ],
         "plugins": [
           "@babel/plugin-transform-modules-amd"
diff --git a/src/components/images/imageLoader.js b/src/components/images/imageLoader.js
index 4247f2c0cb..d610b79938 100644
--- a/src/components/images/imageLoader.js
+++ b/src/components/images/imageLoader.js
@@ -4,10 +4,6 @@ import 'css!./style';
 /* eslint-disable indent */
 
     export function lazyImage(elem, source = elem.getAttribute('data-src')) {
-        if (!elem) {
-            throw new Error('elem cannot be null');
-        }
-
         if (!source) {
             return;
         }
@@ -73,11 +69,8 @@ import 'css!./style';
 
         elem.setAttribute("data-src", url);
 
-        if (userSettings.enableFastFadein()) {
-            elem.classList.remove('lazy-image-fadein-fast');
-        } else {
-            elem.classList.remove('lazy-image-fadein');
-        }
+        elem.classList.remove('lazy-image-fadein-fast');
+        elem.classList.remove('lazy-image-fadein');
     }
 
     export function lazyChildren(elem) {