diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h
index 1bcc8794c..9ffe61acd 100644
--- a/wolfssl/wolfcrypt/settings.h
+++ b/wolfssl/wolfcrypt/settings.h
@@ -30,9 +30,6 @@
     extern "C" {
 #endif
 
-/* Uncomment next line if using Max Strength build */
-/* #define WOLFSSL_MAX_STRENGTH */
-
 /* Uncomment next line if using IPHONE */
 /* #define IPHONE */
 
@@ -108,23 +105,21 @@
 /* Uncomment next line if building for uT-Kernel */
 /* #define WOLFSSL_uTKERNEL2 */
 
+/* Uncomment next line if using Max Strength build */
+/* #define WOLFSSL_MAX_STRENGTH */
+
 #include <wolfssl/wolfcrypt/visibility.h>
 
-#ifdef WOLFSSL_MAX_STRENGTH
-    #undef NO_OLD_TLS
-    #define NO_OLD_TLS
-#endif
-
-#ifdef IPHONE
-    #define SIZEOF_LONG_LONG 8
-#endif
-
-
 #ifdef WOLFSSL_USER_SETTINGS
     #include <user_settings.h>
 #endif
 
 
+#ifdef IPHONE
+    #define SIZEOF_LONG_LONG 8
+#endif
+
+
 #ifdef COMVERGE
     #define THREADX
     #define HAVE_NETX
@@ -765,6 +760,12 @@
     #endif
 #endif
 
+/* If using the max strength build, ensure OLD TLS is disabled. */
+#ifdef WOLFSSL_MAX_STRENGTH
+    #undef NO_OLD_TLS
+    #define NO_OLD_TLS
+#endif
+
 /* Place any other flags or defines here */