diff --git a/config/stack_config.h b/config/stack_config.h
index b63e45e7..5332b048 100644
--- a/config/stack_config.h
+++ b/config/stack_config.h
@@ -39,6 +39,10 @@
  */
 #define CONFIG_MMS_SINGLE_THREADED 0
 
+#if (WITH_MBEDTLS == 1)
+#define CONFIG_MMS_SUPPORT_TLS 1
+#endif
+
 /*
  * Optimize stack for threadless operation - don't use semaphores
  *
diff --git a/src/mms/iso_mms/client/mms_client_connection.c b/src/mms/iso_mms/client/mms_client_connection.c
index 0fc53122..93fb0d18 100644
--- a/src/mms/iso_mms/client/mms_client_connection.c
+++ b/src/mms/iso_mms/client/mms_client_connection.c
@@ -1283,9 +1283,9 @@ MmsConnection_connect(MmsConnection self, MmsError* mmsError, const char* server
     if (serverPort == -1) {
 #if (CONFIG_MMS_SUPPORT_TLS == 1)
         if (self->isoParameters->tlsConfiguration)
-        serverPort = 3782;
+            serverPort = 3782;
         else
-        serverPort = 102;
+            serverPort = 102;
 #else
         serverPort = 102;
 #endif
diff --git a/src/tls/mbedtls/tls_mbedtls.c b/src/tls/mbedtls/tls_mbedtls.c
index 8ee8ace8..f0dc1da2 100644
--- a/src/tls/mbedtls/tls_mbedtls.c
+++ b/src/tls/mbedtls/tls_mbedtls.c
@@ -343,8 +343,10 @@ readFunction(void* ctx, unsigned char* buf, size_t len)
 {
     int ret = Socket_read((Socket) ctx, buf, len);
 
-    if ((ret == 0) && (len > 0))
+    if ((ret == 0) && (len > 0)) {
+        Thread_sleep(1);
         return MBEDTLS_ERR_SSL_WANT_READ;
+    }
 
     return ret;
 }