diff --git a/callback_dispatcher.cc b/callback_dispatcher.cc
index f8050b5..6cd6085 100644
--- a/callback_dispatcher.cc
+++ b/callback_dispatcher.cc
@@ -8,6 +8,9 @@ pEp::CallbackDispatcher pEp::callback_dispatcher;
 namespace pEp {
     PEP_STATUS CallbackDispatcher::messageToSend(::message *msg)
     {
+        if (Adapter::on_sync_thread() && !msg)
+            return PassphraseCache::messageToSend(passphrase_cache, Adapter::session());
+
         return callback_dispatcher._messageToSend(msg);
     }
 
@@ -88,9 +91,6 @@ namespace pEp {
 
     PEP_STATUS CallbackDispatcher::_messageToSend(::message *msg)
     {
-        if (Adapter::on_sync_thread() && !msg)
-            return PassphraseCache::messageToSend(passphrase_cache, Adapter::session());
-
         for (auto target : targets) {
             ::message *_msg = nullptr;
             if (msg) {