diff --git a/gfx/layers/composite/TextureHost.cpp b/gfx/layers/composite/TextureHost.cpp
index d8b0a93a6990..23ecedbc0224 100644
--- a/gfx/layers/composite/TextureHost.cpp
+++ b/gfx/layers/composite/TextureHost.cpp
@@ -644,7 +644,10 @@ TextureParent::CompositorRecycle()
   mozilla::unused << SendCompositorRecycle(handle);
 
   // Don't forget to prepare for the next reycle
-  mWaitForClientRecycle = mTextureHost;
+  // if TextureClient request it.
+  if (mTextureHost->GetFlags() & TEXTURE_RECYCLE) {
+    mWaitForClientRecycle = mTextureHost;
+  }
 }
 
 bool