diff --git a/libraries/AP_NavEKF/AP_NavEKF_core_common.h b/libraries/AP_NavEKF/AP_NavEKF_core_common.h
index 253467cf0d..df576634b4 100644
--- a/libraries/AP_NavEKF/AP_NavEKF_core_common.h
+++ b/libraries/AP_NavEKF/AP_NavEKF_core_common.h
@@ -58,6 +58,10 @@ protected:
 
 #if HAL_WITH_EKF_DOUBLE
 // stack frames are larger with double EKF
+#if MATH_CHECK_INDEXES
+#pragma GCC diagnostic error "-Wframe-larger-than=4000"
+#else
 #pragma GCC diagnostic error "-Wframe-larger-than=2100"
 #endif
+#endif