diff --git a/tcg/tcg.c b/tcg/tcg.c
index 61fcf8597d1fbef96099514e5ec85b210acecbc0..d4616b81e062ccc67cffbcd5522ea3317090d7d9 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -1428,7 +1428,6 @@ TranslationBlock *tcg_tb_alloc(TCGContext *s)
         goto retry;
     }
     qatomic_set(&s->code_gen_ptr, next);
-    s->data_gen_ptr = NULL;
     return tb;
 }
 
@@ -6126,6 +6125,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb, uint64_t pc_start)
      */
     s->code_buf = tcg_splitwx_to_rw(tb->tc.ptr);
     s->code_ptr = s->code_buf;
+    s->data_gen_ptr = NULL;
 
 #ifdef TCG_TARGET_NEED_LDST_LABELS
     QSIMPLEQ_INIT(&s->ldst_labels);