diff --git a/components/ssl/Kconfig b/components/ssl/Kconfig
index 647a978b..161c5ca4 100644
--- a/components/ssl/Kconfig
+++ b/components/ssl/Kconfig
@@ -248,6 +248,13 @@ config MBEDTLS_SSL_ALPN
    help
        Disabling this option will save some code size if it is not needed.
 
+config MBEDTLS_CIPHER_MODE_CTR
+    bool "Support CTR mode"
+    depends on MBEDTLS_TLS_ENABLED
+    default n
+    help
+        Enable Counter Block Cipher mode (CTR) for symmetric ciphers. Required for AES CTR
+
 config MBEDTLS_SSL_SESSION_TICKETS
    bool "TLS: Support RFC 5077 SSL session tickets"
    default n
diff --git a/components/ssl/mbedtls/port/esp8266/include/mbedtls/esp_config.h b/components/ssl/mbedtls/port/esp8266/include/mbedtls/esp_config.h
index 3afb6cc6..cf21710e 100644
--- a/components/ssl/mbedtls/port/esp8266/include/mbedtls/esp_config.h
+++ b/components/ssl/mbedtls/port/esp8266/include/mbedtls/esp_config.h
@@ -480,7 +480,10 @@
  *
  * Enable Counter Block Cipher mode (CTR) for symmetric ciphers.
  */
-//#define MBEDTLS_CIPHER_MODE_CTR
+
+#ifdef CONFIG_MBEDTLS_CIPHER_MODE_CTR
+#define MBEDTLS_CIPHER_MODE_CTR
+#endif
 
 /**
  * \def MBEDTLS_CIPHER_NULL_CIPHER