diff --git a/runtime/caml/domain_state.h b/runtime/caml/domain_state.h
index 4427f21db..ee4613d60 100644
--- a/runtime/caml/domain_state.h
+++ b/runtime/caml/domain_state.h
@@ -33,6 +33,7 @@ typedef struct {
 #endif
 #include "domain_state.tbl"
 #undef DOMAIN_STATE
+    CAMLalign(8) char end_of_domain_state;
 } caml_domain_state;
 
 enum {
@@ -45,9 +46,8 @@ enum {
 /* Check that the structure was laid out without padding,
    since the runtime assumes this in computing offsets */
 CAML_STATIC_ASSERT(
-  sizeof(caml_domain_state) ==
-   (Domain_state_num_fields
-   ) * 8);
+    offsetof(caml_domain_state, end_of_domain_state) ==
+    Domain_state_num_fields * 8);
 
 CAMLextern caml_domain_state* Caml_state;
 #ifdef CAML_NAME_SPACE