diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index 0b449b98ba..525059970c 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -219,8 +219,12 @@ extern const TargetPageBits target_page;
 #else
 extern TargetPageBits target_page;
 #endif
+#ifdef CONFIG_DEBUG_TCG
 #define TARGET_PAGE_BITS   ({ assert(target_page.decided); target_page.bits; })
 #else
+#define TARGET_PAGE_BITS   target_page.bits
+#endif
+#else
 #define TARGET_PAGE_BITS_MIN TARGET_PAGE_BITS
 #endif