diff --git a/RELICENSE/djolemanojlovic.md b/RELICENSE/djolemanojlovic.md
new file mode 100644
index 00000000..b0feb48a
--- /dev/null
+++ b/RELICENSE/djolemanojlovic.md
@@ -0,0 +1,16 @@
+# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
+
+This is a statement by Đorđije Manojlović
+that grants permission to relicense its copyrights in the libzmq C++
+library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
+Open Source Initiative approved license chosen by the current ZeroMQ 
+BDFL (Benevolent Dictator for Life).
+
+A portion of the commits made by the Github handle "djolemanojlovic", with
+commit author "Đorđije Manojlović <djordjije.manojlovic@omicronenergy.com>", 
+are copyright of Đorđije Manojlović.
+This document hereby grants the libzmq project team to relicense libzmq, 
+including all past, present and future contributions of the author listed above.
+
+Đorđije Manojlović
+2022/11/11
diff --git a/src/stream_engine_base.cpp b/src/stream_engine_base.cpp
index bb64e0db..b5ce18c9 100644
--- a/src/stream_engine_base.cpp
+++ b/src/stream_engine_base.cpp
@@ -255,8 +255,14 @@ bool zmq::stream_engine_base_t::in_event_internal ()
             //  Switch into the normal message flow.
             _handshaking = false;
 
-            if (_mechanism == NULL && _has_handshake_stage)
+            if (_mechanism == NULL && _has_handshake_stage) {
                 _session->engine_ready ();
+
+                if (_has_handshake_timer) {
+                    cancel_timer (handshake_timer_id);
+                    _has_handshake_timer = false;
+                }
+            }
         } else
             return false;
     }