diff --git a/src/wrench/simgrid_S4U_util/S4U_Daemon.cpp b/src/wrench/simgrid_S4U_util/S4U_Daemon.cpp
index 76b85040b5..1f3dfabaef 100644
--- a/src/wrench/simgrid_S4U_util/S4U_Daemon.cpp
+++ b/src/wrench/simgrid_S4U_util/S4U_Daemon.cpp
@@ -167,9 +167,9 @@ namespace wrench {
         }
         this->s4u_actor->on_exit(daemon_goodbye, (void *) (this));
 
-        // Set the mailbox_name receiver
-        simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(this->mailbox_name);
-        mailbox->set_receiver(this->s4u_actor);
+        // Set the mailbox_name receiver (causes memory leak)
+//        simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(this->mailbox_name);
+//        mailbox->set_receiver(this->s4u_actor);
       }
     }