diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index aeef320ad..72768eac1 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -129,6 +129,9 @@ jobs:
         run: ./bin/inv_wrapper.sh dev.cmake --clean --build=Debug --sanitiser ${{ matrix.sanitiser }}
       - name: "Build tests"
         run: ./bin/inv_wrapper.sh dev.cc faabric_tests
+        # Try to make the NNG panics consistent in GHA
+      - name: "Run one conflicting test in repeat"
+        run: /build/faabric/static/bin/faabric_tests "Test starting and stopping the function migration thread"
       - name: "Run tests"
         run: ./bin/inv_wrapper.sh tests
 
diff --git a/src/transport/MessageEndpoint.cpp b/src/transport/MessageEndpoint.cpp
index 77cece848..18391783c 100644
--- a/src/transport/MessageEndpoint.cpp
+++ b/src/transport/MessageEndpoint.cpp
@@ -279,11 +279,13 @@ void MessageEndpoint::sendMessage(uint8_t header,
 
     nng_aio_set_msg(aio, msg);
 
+    /*
     if (context.has_value()) {
         nng_ctx_send(*context, aio);
     } else {
+    */
         nng_send_aio(socket, aio);
-    }
+    // }
 
     nng_aio_wait(aio);
     int ec = nng_aio_result(aio);