diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8431e4db..104ab6d0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -206,12 +206,12 @@ jobs:
       - name: Build shared libraries using CMake
         run: |
           mkdir build-shared && cd build-shared
-          cmake -DENABLE_RDMA=ON ..
+          cmake -DENABLE_RDMA=ON -DCMAKE_BUILD_TYPE=Release ..
           sudo make install
       - name: Build static libraries using CMake
         run: |
           mkdir build-static && cd build-static
-          cmake -DBUILD_SHARED_LIBS=OFF -DENABLE_RDMA=ON ..
+          cmake -DBUILD_SHARED_LIBS=OFF -DENABLE_RDMA=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
           sudo make install
       - name: Build using Makefile
         run: |
diff --git a/src/rdma.c b/src/rdma.c
index 8a310863..6b8ef6ef 100644
--- a/src/rdma.c
+++ b/src/rdma.c
@@ -1035,8 +1035,7 @@ static int valkeyRdmaCM(valkeyContext *c, long timeout) {
 
 static int valkeyRdmaWaitConn(valkeyContext *c, long timeout) {
     long now, end;
-    RdmaContext *ctx = c->privctx;
-    struct epoll_event events[1], *event;
+    struct epoll_event events[1];
     int nevent;
 
     assert(timeout >= 0);
@@ -1062,8 +1061,9 @@ static int valkeyRdmaWaitConn(valkeyContext *c, long timeout) {
             return VALKEY_ERR;
         }
 
-        event = &events[0];
-        assert(event->data.fd == ctx->cm_channel->fd); /* CM channel fd wakes up only now */
+        /* Only the CM channel fd is polled here */
+        assert(events[0].data.fd == ((RdmaContext *)c->privctx)->cm_channel->fd);
+
         if (valkeyRdmaCM(c, end - now) == VALKEY_ERR) {
             return VALKEY_ERR;
         }