diff --git a/src/common/Channel.cpp b/src/common/Channel.cpp
index caa432752..b7247a462 100644
--- a/src/common/Channel.cpp
+++ b/src/common/Channel.cpp
@@ -146,7 +146,8 @@ void Channel::addOrReplaceTimeout(MessagePtr message)
 
             this->replaceMessage(s, replacement.release());
 
-            return;
+            addMessage = false;
+            break;
         }
     }