diff --git a/expetator/experiment.py b/expetator/experiment.py
index ecee5c255d5200ab353f4ba698058bd9b407ea3e..c133f3e6dd2f0bab38d302e7806f265503122ca6 100755
--- a/expetator/experiment.py
+++ b/expetator/experiment.py
@@ -65,7 +65,7 @@ class Executor:
 
     def remove_host(self):
         if self.nbhosts == 1:
-            return
+            return self.hostnames[0]
         res = self.hostnames.pop(0)
         self.init_mpi_files(self.hostnames)
         return res