diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_plugin.c b/src/libstrongswan/plugins/pkcs11/pkcs11_plugin.c
index aa27f1e38..3314d2f85 100644
--- a/src/libstrongswan/plugins/pkcs11/pkcs11_plugin.c
+++ b/src/libstrongswan/plugins/pkcs11/pkcs11_plugin.c
@@ -90,8 +90,8 @@ static void token_event_cb(private_pkcs11_plugin_t *this, pkcs11_library_t *p11,
 			{
 				this->mutex->lock(this->mutex);
 				this->creds->insert_last(this->creds, creds);
-				this->mutex->unlock(this->mutex);
 				lib->credmgr->add_set(lib->credmgr, &creds->set);
+				this->mutex->unlock(this->mutex);
 			}
 		}
 	}