diff --git a/cpu.c b/cpu.c
index f9652523ee..7dd96b7dbf 100644
--- a/cpu.c
+++ b/cpu.c
@@ -63,7 +63,7 @@ struct libafl_hook {
 
 struct libafl_hook* libafl_qemu_hooks = NULL;
 
-CPUArchState *libafl_qemu_env;
+__thread CPUArchState *libafl_qemu_env;
 
 void libafl_helper_table_add(TCGHelperInfo* info);
 
diff --git a/linux-user/main.c b/linux-user/main.c
index dcb969d17e..088a25098b 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -630,7 +630,7 @@ uint64_t libafl_load_addr(void);
 int libafl_qemu_main(void);
 int libafl_qemu_run(void);
 
-extern CPUArchState *libafl_qemu_env;
+extern __thread CPUArchState *libafl_qemu_env;
 
 struct image_info libafl_image_info;