diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/UIWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/UIWidget.java
index f5ecf3266..912306e2c 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/UIWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/UIWidget.java
@@ -107,7 +107,7 @@ public void setSurfaceTexture(SurfaceTexture aTexture, final int aWidth, final i
             Log.d(LOGTAG, "Texture already set");
             return;
         }
-        mFirstDrawCallback = aFirstDrawCallback;
+
         if (mRenderer != null && mRenderer.isLayer()) {
             // Widget is using a layer write-only surface but we also want a proxy.
             if (mProxyRenderer != null) {
@@ -116,6 +116,8 @@ public void setSurfaceTexture(SurfaceTexture aTexture, final int aWidth, final i
             mProxyRenderer = new UISurfaceTextureRenderer(aTexture, aWidth, aHeight);
             postInvalidate();
             return;
+        } else {
+            mFirstDrawCallback = aFirstDrawCallback;
         }
         mTexture = aTexture;
         if (mRenderer != null) {