--- a/gfx/layers/client/TextureClient.cpp
+++ b/gfx/layers/client/TextureClient.cpp
@@ -641,17 +641,19 @@ TextureClient::RecycleTexture(TextureFla
       mActor->SendRecycleTexture(mFlags);
     }
   }
 }
 
 void
 TextureClient::WaitForCompositorRecycle()
 {
-  mActor->WaitForCompositorRecycle();
+  if (IsSharedWithCompositor()) {
+    mActor->WaitForCompositorRecycle();
+  }
 }
 
 void
 TextureClient::SetAddedToCompositableClient()
 {
   if (!mAddedToCompositableClient) {
     mAddedToCompositableClient = true;
   }