diff --git a/History.md b/History.md
index 895a597f08..2695d0078f 100644
--- a/History.md
+++ b/History.md
@@ -140,6 +140,9 @@
   - Allow usage of `http` package both v1 and v2 for backward compatibility
   - Blaze weak dependency updated to v2.5.0
 
+* `ddp-server@2.4.1`
+  - Fix a bug where `testMessageOnConnect` has always been sent
+
 ## v2.3.5, 2021-08-12
 
 #### Highlights
diff --git a/packages/ddp-server/stream_server.js b/packages/ddp-server/stream_server.js
index b39373f2f9..49c0f1385d 100644
--- a/packages/ddp-server/stream_server.js
+++ b/packages/ddp-server/stream_server.js
@@ -119,7 +119,7 @@ StreamServer = function () {
 
     // only to send a message after connection on tests, useful for
     // socket-stream-client/server-tests.js
-    if (process.env.TEST_METADATA) {
+    if (process.env.TEST_METADATA && process.env.TEST_METADATA !== "{}") {
       socket.send(JSON.stringify({ testMessageOnConnect: true }));
     }