diff --git a/src/libsodium/sodium/core.c b/src/libsodium/sodium/core.c
index 214ef5f8..bd35b6ae 100644
--- a/src/libsodium/sodium/core.c
+++ b/src/libsodium/sodium/core.c
@@ -193,7 +193,7 @@ sodium_misuse(void)
     (void) sodium_crit_leave();
     if (sodium_crit_enter() == 0) {
         handler = _misuse_handler;
-        if (handler != NULL) {
+        if (sodium_crit_leave() == 0 && handler != NULL) {
             handler();
         }
     }