diff --git a/src/org_pEp_jniadapter_AbstractEngine.cc b/src/org_pEp_jniadapter_AbstractEngine.cc
index 3b92f9e..3503ade 100644
--- a/src/org_pEp_jniadapter_AbstractEngine.cc
+++ b/src/org_pEp_jniadapter_AbstractEngine.cc
@@ -17,8 +17,8 @@ namespace pEp {
     using namespace pEp::Adapter;
     using namespace utility;
 
-    thread_local JNIEnv* thread_env = nullptr;
-    thread_local jobject thread_obj = nullptr;
+    JNIEnv* thread_env = nullptr;
+    jobject thread_obj = nullptr;
 
     jclass messageClass = nullptr;
     jclass identityClass = nullptr;