diff --git a/subcmds/forall.py b/subcmds/forall.py
index 74d1ede75..a13793d09 100644
--- a/subcmds/forall.py
+++ b/subcmds/forall.py
@@ -370,8 +370,8 @@ def DoWork(project, mirror, opt, cmd, shell, cnt, config):
       for s in in_ready:
         buf = s.read().decode()
         if not buf:
-          s.close()
           s_in.remove(s)
+          s.close()
           continue
 
         if not opt.verbose: