diff --git a/src/internal.c b/src/internal.c
index 970bece9b..511d77ef2 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -12914,8 +12914,11 @@ int SendKexDhReply(WOLFSSH* ssh)
         ret = BundlePacket(ssh);
     }
 
-    if (ret == WS_SUCCESS)
+    if (ret == WS_SUCCESS) {
+        ssh->handshake->expectMsgId = MSGID_NEWKEYS;
+        WLOG_EXPECT_MSGID(ssh->handshake->expectMsgId);
         ret = SendNewKeys(ssh);
+    }
 
     if (ret == WS_SUCCESS && ssh->sendExtInfo) {
         ret = SendExtInfo(ssh);