diff --git a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp
index 33e5e93131..8da8cb432d 100644
--- a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp
@@ -111,7 +111,7 @@ bool Basic2DWindowOpenGLDisplayPlugin::internalActivate() {
 
 gpu::PipelinePointer Basic2DWindowOpenGLDisplayPlugin::getCompositeScenePipeline() {
 #if defined(Q_OS_ANDROID)
-        return _compositePipeline;
+        return _linearToSRGBPipeline;
 #endif
         //return _drawTexturePipeline;
         return _SRGBToLinearPipeline;
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index 2f66e07e6e..615fca1096 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -398,7 +398,7 @@ void OpenGLDisplayPlugin::customizeContext() {
         _drawTexturePipeline = gpu::Pipeline::create(gpu::Shader::createProgram(DrawTexture), scissorState);
     }
     {
-        _compositePipeline = gpu::Pipeline::create(gpu::Shader::createProgram(DrawTextureGammaLinearToSRGB), scissorState);
+        _linearToSRGBPipeline = gpu::Pipeline::create(gpu::Shader::createProgram(DrawTextureGammaLinearToSRGB), scissorState);
     }
     {
         _SRGBToLinearPipeline = gpu::Pipeline::create(gpu::Shader::createProgram(DrawTextureGammaSRGBToLinear), scissorState);
@@ -917,6 +917,8 @@ void OpenGLDisplayPlugin::render(std::function<void(gpu::Batch& batch)> f) {
 OpenGLDisplayPlugin::~OpenGLDisplayPlugin() {
 }
 
+// FIXME: added this to allow desktop composite framebuffer to be RGBA while mobile is SRGBA.
+// This is a workaround
 gpu::Element OpenGLDisplayPlugin::getCompositeFBColorSpace() {
     return gpu::Element::COLOR_RGBA_32;
 }
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
index 0b8fa19daf..672d9a4beb 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
@@ -153,7 +153,7 @@ protected:
     gpu::PipelinePointer _mirrorHUDPipeline;
     gpu::ShaderPointer _mirrorHUDPS;
     gpu::PipelinePointer _drawTexturePipeline;
-    gpu::PipelinePointer _compositePipeline;
+    gpu::PipelinePointer _linearToSRGBPipeline;
     gpu::PipelinePointer _SRGBToLinearPipeline;
     gpu::PipelinePointer _cursorPipeline;
 
diff --git a/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.cpp b/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.cpp
index 25159a40a3..9809d02866 100644
--- a/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.cpp
+++ b/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.cpp
@@ -102,10 +102,6 @@ void OculusMobileDisplayPlugin::uncustomizeContext() {
     Parent::uncustomizeContext();
 }
 
-gpu::Element OculusMobileDisplayPlugin::getCompositeFBColorSpace() {
-    return gpu::Element::COLOR_SRGBA_32;
-}
-
 QRectF OculusMobileDisplayPlugin::getPlayAreaRect() {
     QRectF result;
     VrHandler::withOvrMobile([&](ovrMobile* session){
diff --git a/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.h b/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.h
index 88f14f0a73..a98989655e 100644
--- a/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.h
+++ b/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.h
@@ -44,8 +44,6 @@ public:
     void init() override;
     void deinit() override;
 
-    virtual gpu::Element getCompositeFBColorSpace() override;
-
 protected:
     const QString getName() const override { return NAME; }
 
diff --git a/plugins/oculus/src/OculusDisplayPlugin.cpp b/plugins/oculus/src/OculusDisplayPlugin.cpp
index bd0c77ae57..c493588992 100644
--- a/plugins/oculus/src/OculusDisplayPlugin.cpp
+++ b/plugins/oculus/src/OculusDisplayPlugin.cpp
@@ -124,6 +124,10 @@ void OculusDisplayPlugin::uncustomizeContext() {
     Parent::uncustomizeContext();
 }
 
+gpu::PipelinePointer OculusDisplayPlugin::getCompositeScenePipeline() {
+    return _SRGBToLinearPipeline;
+}
+
 static const uint64_t FRAME_BUDGET = (11 * USECS_PER_MSEC);
 static const uint64_t FRAME_OVER_BUDGET = (15 * USECS_PER_MSEC);
 
diff --git a/plugins/oculus/src/OculusDisplayPlugin.h b/plugins/oculus/src/OculusDisplayPlugin.h
index 9209fd373e..8eda599fa9 100644
--- a/plugins/oculus/src/OculusDisplayPlugin.h
+++ b/plugins/oculus/src/OculusDisplayPlugin.h
@@ -34,6 +34,8 @@ protected:
     void uncustomizeContext() override;
     void cycleDebugOutput() override;
 
+    virtual gpu::PipelinePointer getCompositeScenePipeline() override;
+
 private:
     static const char* NAME;
     ovrTextureSwapChain _textureSwapChain;