diff --git a/src/call.cpp b/src/call.cpp
index 27a88efbd98faa264876428439fed576bcadfbad..4ccf4a00dfd843bdfbac354148a28c15fc4cf22c 100644
--- a/src/call.cpp
+++ b/src/call.cpp
@@ -267,7 +267,7 @@ Call::setState(CallState call_state, ConnectionState cnx_state, signed code)
     connectionState_ = cnx_state;
     auto new_client_state = getStateStr();
 
-    for (auto it = stateChangedListeners_.begin(); it != stateChangedListeners_.end(); ) {
+    for (auto it = stateChangedListeners_.begin(); it != stateChangedListeners_.end();) {
         if ((*it)(callState_, connectionState_, code))
             ++it;
         else
diff --git a/src/manager.cpp b/src/manager.cpp
index 74735b7843998f84d17206f7976ad575037b5509..c727785750835cacdbeab2972e8fa5fbca8f3d6b 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -1270,13 +1270,8 @@ Manager::hangupConference(const std::string& id)
     JAMI_DBG("Hangup conference %s", id.c_str());
     if (auto conf = getConferenceFromID(id)) {
         ParticipantSet participants(conf->getParticipantList());
-        for (const auto& callId : participants) {
-            if (auto call = getCallFromCallID(callId)) {
-                call->resetConfInfo();
-                call->exitConference();
-            }
+        for (const auto& callId : participants)
             hangupCall(callId);
-        }
         pimpl_->unsetCurrentCall();
         return true;
     }