--- a/gfx/layers/composite/CompositableHost.cpp
+++ b/gfx/layers/composite/CompositableHost.cpp
@@ -55,21 +55,28 @@ CompositableHost::AddTextureHost(Texture
   RefPtr<TextureHost> second = mFirstTexture;
   mFirstTexture = aTexture;
   aTexture->SetNextSibling(second);
 }
 
 void
 CompositableHost::RemoveTextureHost(uint64_t aTextureID)
 {
+  if (mFirstTexture && mFirstTexture->GetID() == aTextureID) {
+    RefPtr<TextureHost> toRemove = mFirstTexture;
+    mFirstTexture = mFirstTexture->GetNextSibling();
+    toRemove->SetNextSibling(nullptr);
+  }
   RefPtr<TextureHost> it = mFirstTexture;
   while (it) {
     if (it->GetNextSibling() &&
         it->GetNextSibling()->GetID() == aTextureID) {
+      RefPtr<TextureHost> toRemove = it->GetNextSibling();
       it->SetNextSibling(it->GetNextSibling()->GetNextSibling());
+      toRemove->SetNextSibling(nullptr);
     }
     it = it->GetNextSibling();
   }
 }
 
 TextureHost*
 CompositableHost::GetTextureHost(uint64_t aTextureID)
 {