diff --git a/callback_dispatcher.cc b/callback_dispatcher.cc
index 6f4a3ce..c1e8d1d 100644
--- a/callback_dispatcher.cc
+++ b/callback_dispatcher.cc
@@ -80,8 +80,8 @@ namespace pEp {
 
     void CallbackDispatcher::stop_sync()
     {
-        callback_dispatcher.semaphore.go();
         pEp::Adapter::shutdown();
+        callback_dispatcher.semaphore.go();
 
         for (auto target : callback_dispatcher.targets) {
             if (target.notifyHandshake)