diff --git a/CHANGES-4.3.md b/CHANGES-4.3.md
index b14be45a7..944b208a3 100644
--- a/CHANGES-4.3.md
+++ b/CHANGES-4.3.md
@@ -23,6 +23,8 @@ File format:
 * Fix case where publishing to a non-existent topic alias would crash the connection [#6979]
 * Fix HTTP-API 500 error on querying the lwm2m client list on the another node [#7009]
 * Fix the ExProto connection registry is not released after the client process abnormally exits [#6983]
+* Fix Server-KeepAlive wrongly applied on MQTT v3.0/v3.1 [#7085]
+* Fix Stomp client can not trigger `$event/client_connection` message [#7096]
 
 ## v4.3.12
 ### Important changes
diff --git a/apps/emqx_stomp/src/emqx_stomp_protocol.erl b/apps/emqx_stomp/src/emqx_stomp_protocol.erl
index 6049b88f3..96e1a3203 100644
--- a/apps/emqx_stomp/src/emqx_stomp_protocol.erl
+++ b/apps/emqx_stomp/src/emqx_stomp_protocol.erl
@@ -152,7 +152,7 @@ default_conninfo(ConnInfo) ->
       clean_start => true,
       clientid => undefined,
       username => undefined,
-      conn_props => [],
+      conn_props => #{},
       connected => false,
       connected_at => undefined,
       keepalive => undefined,
@@ -814,4 +814,3 @@ interval(outgoing_timer, #pstate{heart_beats = HrtBt}) ->
     emqx_stomp_heartbeat:interval(outgoing, HrtBt);
 interval(clean_trans_timer, _) ->
     ?TRANS_TIMEOUT.
-