diff --git a/gfx/thebes/gfxContext.cpp b/gfx/thebes/gfxContext.cpp
index deb782742ce4..f9f8a6dee108 100644
--- a/gfx/thebes/gfxContext.cpp
+++ b/gfx/thebes/gfxContext.cpp
@@ -57,7 +57,6 @@ gfxContext::gfxContext(DrawTarget* aTarget, const Point& aDeviceOffset)
   }
 
   mStateStack.SetLength(1);
-  CurrentState().drawTarget = mDT;
   CurrentState().deviceOffset = aDeviceOffset;
   mDT->SetTransform(GetDTTransform());
 }
@@ -94,7 +93,7 @@ already_AddRefed<gfxContext> gfxContext::CreatePreservingTransformOrNull(
 gfxContext::~gfxContext() {
   for (int i = mStateStack.Length() - 1; i >= 0; i--) {
     for (unsigned int c = 0; c < mStateStack[i].pushedClips.Length(); c++) {
-      mStateStack[i].drawTarget->PopClip();
+      mDT->PopClip();
     }
   }
 }
@@ -158,8 +157,6 @@ void gfxContext::Restore() {
 
   mStateStack.RemoveLastElement();
 
-  mDT = CurrentState().drawTarget;
-
   ChangeTransform(CurrentState().transform, false);
 }
 
diff --git a/gfx/thebes/gfxContext.h b/gfx/thebes/gfxContext.h
index 9af4ec4e1afe..8cc2fa5fdd4a 100644
--- a/gfx/thebes/gfxContext.h
+++ b/gfx/thebes/gfxContext.h
@@ -486,7 +486,6 @@ class gfxContext final {
     CopyableTArray<PushedClip> pushedClips;
     CopyableTArray<Float> dashPattern;
     StrokeOptions strokeOptions;
-    RefPtr<DrawTarget> drawTarget;
     mozilla::gfx::AntialiasMode aaMode;
     bool patternTransformChanged;
     Matrix patternTransform;
@@ -523,7 +522,7 @@ class gfxContext final {
     return mStateStack[mStateStack.Length() - 1];
   }
 
-  RefPtr<DrawTarget> mDT;
+  RefPtr<DrawTarget> const mDT;
   float mCrossProcessPaintScale = 1.0f;
 };