diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index e1c3af1939..369e4848d1 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -198,6 +198,8 @@
 #include <raypick/RayPickScriptingInterface.h>
 #include <raypick/LaserPointerScriptingInterface.h>
 
+#include <FadeEffect.h>
+
 #include "commerce/Ledger.h"
 #include "commerce/Wallet.h"
 #include "commerce/QmlCommerce.h"
@@ -682,6 +684,8 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::set<Ledger>();
     DependencyManager::set<Wallet>();
 
+    DependencyManager::set<FadeEffect>();
+
     DependencyManager::set<LaserPointerScriptingInterface>();
     DependencyManager::set<RayPickScriptingInterface>();
 
diff --git a/libraries/render-utils/src/FadeEffect.cpp b/libraries/render-utils/src/FadeEffect.cpp
index 418d02a4e7..c94fe717f1 100644
--- a/libraries/render-utils/src/FadeEffect.cpp
+++ b/libraries/render-utils/src/FadeEffect.cpp
@@ -16,7 +16,8 @@
 #include <PathUtils.h>
 
 FadeEffect::FadeEffect() {
-
+    auto texturePath = PathUtils::resourcesPath() + "images/fadeMask.png";
+    _maskMap = DependencyManager::get<TextureCache>()->getImageTexture(texturePath, image::TextureUsage::STRICT_TEXTURE);
 }
 
 void FadeEffect::build(render::Task::TaskConcept& task, const task::Varying& editableItems) {
@@ -28,15 +29,11 @@ void FadeEffect::build(render::Task::TaskConcept& task, const task::Varying& edi
     task.addJob<FadeEditJob>("FadeEdit", fadeEditInput);
 }
 
-render::ShapePipeline::BatchSetter FadeEffect::getBatchSetter() {
+render::ShapePipeline::BatchSetter FadeEffect::getBatchSetter() const {
     return [this](const render::ShapePipeline& shapePipeline, gpu::Batch& batch, render::Args*) {
         auto program = shapePipeline.pipeline->getProgram();
         auto maskMapLocation = program->getTextures().findLocation("fadeMaskMap");
         auto bufferLocation = program->getUniformBuffers().findLocation("fadeParametersBuffer");
-        if (!_maskMap) {
-            auto texturePath = PathUtils::resourcesPath() + "images/fadeMask.png";
-            _maskMap = DependencyManager::get<TextureCache>()->getImageTexture(texturePath, image::TextureUsage::STRICT_TEXTURE);
-        }
         batch.setResourceTexture(maskMapLocation, _maskMap);
         batch.setUniformBuffer(bufferLocation, _configurations);
     };
diff --git a/libraries/render-utils/src/FadeEffect.h b/libraries/render-utils/src/FadeEffect.h
index 9827f67a7f..4b4e401332 100644
--- a/libraries/render-utils/src/FadeEffect.h
+++ b/libraries/render-utils/src/FadeEffect.h
@@ -21,7 +21,7 @@ public:
 
     void build(render::Task::TaskConcept& task, const task::Varying& editableItems);
 
-    render::ShapePipeline::BatchSetter getBatchSetter();
+    render::ShapePipeline::BatchSetter getBatchSetter() const;
     render::ShapePipeline::ItemSetter getItemUniformSetter() const;
     render::ShapePipeline::ItemSetter getItemStoredSetter();
 
diff --git a/libraries/render-utils/src/RenderDeferredTask.cpp b/libraries/render-utils/src/RenderDeferredTask.cpp
index c67a1c7875..85df1ee8de 100644
--- a/libraries/render-utils/src/RenderDeferredTask.cpp
+++ b/libraries/render-utils/src/RenderDeferredTask.cpp
@@ -49,8 +49,8 @@ using namespace render;
 extern void initOverlay3DPipelines(render::ShapePlumber& plumber, bool depthTest = false);
 extern void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePipeline::BatchSetter& batchSetter, const render::ShapePipeline::ItemSetter& itemSetter);
 
-RenderDeferredTask::RenderDeferredTask() {
-    DependencyManager::set<FadeEffect>();
+RenderDeferredTask::RenderDeferredTask()
+{
 }
 
 void RenderDeferredTask::configure(const Config& config)