diff --git a/gfx/layers/basic/BasicCompositor.cpp b/gfx/layers/basic/BasicCompositor.cpp
index 1ee6bdc399bdd..f0010874994c6 100644
--- a/gfx/layers/basic/BasicCompositor.cpp
+++ b/gfx/layers/basic/BasicCompositor.cpp
@@ -1033,6 +1033,9 @@ void BasicCompositor::EndFrame() {
   // Pop aInvalidregion
   mRenderTarget->mDrawTarget->PopClip();
 
+  // Reset the translation that was applied in BeginFrame.
+  mRenderTarget->mDrawTarget->SetTransform(gfx::Matrix());
+
   TryToEndRemoteDrawing();
 
   // If we are no longer recording a profile, we can drop the render target if
diff --git a/widget/CompositorWidget.cpp b/widget/CompositorWidget.cpp
index fd6fd456efbb3..63cf2f6d0568f 100644
--- a/widget/CompositorWidget.cpp
+++ b/widget/CompositorWidget.cpp
@@ -39,7 +39,6 @@ already_AddRefed<gfx::DrawTarget> CompositorWidget::GetBackBufferDrawTarget(
       mLastBackBuffer->GetFormat() == format &&
       mLastBackBuffer->GetSize() == clientSize) {
     target = mLastBackBuffer;
-    target->SetTransform(gfx::Matrix());
     if (!aClearRect.IsEmpty()) {
       gfx::IntRect clearRect =
           aClearRect.ToUnknownRect() - aRect.ToUnknownRect().TopLeft();