diff --git a/client/deps/mbedtls.cmake b/client/deps/mbedtls.cmake
index 649326f51..40929e1ea 100644
--- a/client/deps/mbedtls.cmake
+++ b/client/deps/mbedtls.cmake
@@ -8,7 +8,6 @@ add_library(pm3rrg_rdv4_mbedtls STATIC
         ../../common/mbedtls/entropy_poll.c
         ../../common/mbedtls/entropy.c
         ../../common/mbedtls/error.c
-        ../../common/mbedtls/timing.c
         ../../common/mbedtls/ecp.c
         ../../common/mbedtls/ecp_curves.c
         ../../common/mbedtls/certs.c
diff --git a/client/src/emv/test/cryptotest.c b/client/src/emv/test/cryptotest.c
index c15ec54f9..4e6c1192e 100644
--- a/client/src/emv/test/cryptotest.c
+++ b/client/src/emv/test/cryptotest.c
@@ -23,7 +23,7 @@
 #include "base64.h"
 #include "ctr_drbg.h"
 #include "entropy.h"
-#include "timing.h"
+//#include "timing.h" // Beware it requires adjustments for ProxSpace
 #include "crypto_test.h"
 #include "sda_test.h"
 #include "dda_test.h"
@@ -56,6 +56,7 @@ int ExecuteCryptoTests(bool verbose, bool ignore_time, bool include_slow_tests)
     res = mbedtls_entropy_self_test(verbose);
     if (res && !ignore_time) TestFail = true;
 
+    /*
     // retry for CI (when resources too low)
     for (int i = 0; i < 3; i++) {
         res = mbedtls_timing_self_test(verbose);
@@ -64,6 +65,7 @@ int ExecuteCryptoTests(bool verbose, bool ignore_time, bool include_slow_tests)
         PrintAndLogEx(WARNING, "Repeat timing test " _RED_("%d"), i + 1);
     }
     if (res && !ignore_time) TestFail = true;
+*/
 
     res = mbedtls_ctr_drbg_self_test(verbose);
     if (res) TestFail = true;
diff --git a/common/mbedtls/Makefile b/common/mbedtls/Makefile
index c14e2e304..142ac6b12 100644
--- a/common/mbedtls/Makefile
+++ b/common/mbedtls/Makefile
@@ -12,7 +12,6 @@ MYSRCS = \
 	entropy_poll.c \
 	entropy.c \
 	error.c \
-	timing.c \
 	ecp.c \
 	ecp_curves.c \
 	certs.c \
diff --git a/common/mbedtls/config.h b/common/mbedtls/config.h
index ee7a685c9..e6138bc6b 100644
--- a/common/mbedtls/config.h
+++ b/common/mbedtls/config.h
@@ -3438,7 +3438,7 @@
  *
  * This module is used by the HAVEGE random number generator.
  */
-#define MBEDTLS_TIMING_C
+//#define MBEDTLS_TIMING_C
 
 /**
  * \def MBEDTLS_VERSION_C