diff --git a/hgext3rd/fbamend/hiddenoverride.py b/hgext3rd/fbamend/hiddenoverride.py
index 523c62ee7e..8135d84681 100644
--- a/hgext3rd/fbamend/hiddenoverride.py
+++ b/hgext3rd/fbamend/hiddenoverride.py
@@ -29,8 +29,10 @@ def uisetup(ui):
 def pinnedrevs(orig, repo):
     revs = orig(repo)
     nodemap = repo.changelog.nodemap
-    pinned = list(nodemap[n] for n in loadpinnednodes(repo) if n in nodemap)
-    revs.update(pinned)
+    pinnednodes = set(loadpinnednodes(repo))
+    tounpin = getattr(repo, '_tounpinnodes', set())
+    pinnednodes -= tounpin
+    revs.update(nodemap[n] for n in pinnednodes)
     return revs
 
 def loadpinnednodes(repo):