diff --git a/src/ca/client/ca_client_context.cpp b/src/ca/client/ca_client_context.cpp
index a2e5d8ac3..2bb3e24a8 100644
--- a/src/ca/client/ca_client_context.cpp
+++ b/src/ca/client/ca_client_context.cpp
@@ -165,7 +165,7 @@ ca_client_context::ca_client_context ( bool enablePreemptiveCallback ) :
     }
 
     // multiple steps ensure exception safety
-    std::swap(this->pCallbackGuard, pCBGuard);
+    this->pCallbackGuard = pCBGuard;
 }
 
 ca_client_context::~ca_client_context ()