diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
index 03dae1044edd3792ba79a6e3534cbada67dee6b2_aGdleHQvbGFyZ2VmaWxlcy9vdmVycmlkZXMucHk=..013637f4812e576d83a1e43e6b5db15de8d9c8a5_aGdleHQvbGFyZ2VmaWxlcy9vdmVycmlkZXMucHk= 100644
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -160,7 +160,8 @@
 
 @contextlib.contextmanager
 def lfstatus(repo):
+    oldvalue = getattr(repo, 'lfstatus', False)
     repo.lfstatus = True
     try:
         yield
     finally:
@@ -163,8 +164,8 @@
     repo.lfstatus = True
     try:
         yield
     finally:
-        repo.lfstatus = False
+        repo.lfstatus = oldvalue
 
 
 def removelargefiles(ui, repo, isaddremove, matcher, uipathfn, dryrun, **opts):