diff --git a/src/ice_transport.cpp b/src/ice_transport.cpp
index d932021053daa120fbf4172523e1eac074ab982e..3abf63d6ad13658fd443471ff2fec7ee0dd65009 100644
--- a/src/ice_transport.cpp
+++ b/src/ice_transport.cpp
@@ -373,7 +373,7 @@ IceTransport::Impl::initIceInstance(const IceTransportOptions& options)
     compCount_ = streamsCount_ * compCountPerStream_;
     compIO_ = std::vector<ComponentIO>(compCount_);
     peerChannels_ = std::vector<PeerChannel>(compCount_);
-    iceDefaultRemoteAddr_.reserve(compCount_);
+    iceDefaultRemoteAddr_.resize(compCount_);
     initiatorSession_ = options.master;
     accountLocalAddr_ = std::move(options.accountLocalAddr);
     accountPublicAddr_ = std::move(options.accountPublicAddr);
@@ -1087,9 +1087,7 @@ IpAddr
 IceTransport::Impl::getDefaultRemoteAddress(unsigned compId) const
 {
     ASSERT_COMP_ID(compId, compCount_);
-    if (compId < iceDefaultRemoteAddr_.size())
-        return iceDefaultRemoteAddr_[compId - 1];
-    return {};
+    return iceDefaultRemoteAddr_[compId - 1];
 }
 
 void
diff --git a/src/sip/sipaccount.cpp b/src/sip/sipaccount.cpp
index e1459989eb16c2afc42487b9767814a78e95ae4e..ac92eae687e3ead235b0495663fbbed318f5ddfa 100644
--- a/src/sip/sipaccount.cpp
+++ b/src/sip/sipaccount.cpp
@@ -1387,7 +1387,9 @@ SIPAccount::initTlsConfiguration()
 
     JAMI_DBG("Using %zu ciphers", ciphers_.size());
     tlsSetting_.ciphers_num = ciphers_.size();
-    tlsSetting_.ciphers = &ciphers_.front();
+    if (tlsSetting_.ciphers_num > 0) {
+        tlsSetting_.ciphers = &ciphers_.front();
+    }
 
     tlsSetting_.verify_server = tlsVerifyServer_;
     tlsSetting_.verify_client = tlsVerifyClient_;