diff --git a/layout/printing/PrintTranslator.h b/layout/printing/PrintTranslator.h
index 629b54854d65..7784dccf73e3 100644
--- a/layout/printing/PrintTranslator.h
+++ b/layout/printing/PrintTranslator.h
@@ -85,7 +85,11 @@ class PrintTranslator final : public Translator {
   }
 
   void AddDrawTarget(ReferencePtr aRefPtr, DrawTarget* aDT) final {
-    mDrawTargets.InsertOrUpdate(aRefPtr, RefPtr{aDT});
+    RefPtr<DrawTarget>& value = mDrawTargets.LookupOrInsert(aRefPtr);
+    if (mCurrentDT && mCurrentDT == value) {
+      mCurrentDT = nullptr;
+    }
+    value = aDT;
   }
 
   void AddPath(ReferencePtr aRefPtr, Path* aPath) final {
@@ -119,11 +123,11 @@ class PrintTranslator final : public Translator {
   }
 
   void RemoveDrawTarget(ReferencePtr aRefPtr) final {
-    ReferencePtr currentDT = mCurrentDT;
-    if (currentDT == aRefPtr) {
+    RefPtr<DrawTarget> removedDT;
+    if (mDrawTargets.Remove(aRefPtr, getter_AddRefs(removedDT)) &&
+        mCurrentDT == removedDT) {
       mCurrentDT = nullptr;
     }
-    mDrawTargets.Remove(aRefPtr);
   }
 
   bool SetCurrentDrawTarget(ReferencePtr aRefPtr) final {