diff --git a/src/AIoTC_Config.h b/src/AIoTC_Config.h
index 05e24f03a..e9270adb6 100644
--- a/src/AIoTC_Config.h
+++ b/src/AIoTC_Config.h
@@ -113,14 +113,14 @@
 #endif
 
 #if defined(ARDUINO_SAMD_MKRGSM1400) || defined(ARDUINO_SAMD_MKR1000) ||   \
-  defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_NANO_33_IOT) || \
   defined(ARDUINO_SAMD_MKRNB1500) || defined(ARDUINO_PORTENTA_H7_M7)      ||   \
   defined(ARDUINO_PORTENTA_H7_M4)
   #define BOARD_HAS_ECCX08
   #define HAS_TCP
 #endif
 
-#if defined(ARDUINO_AVR_UNO_WIFI_REV2)
+#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || \
+  defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_NANO_33_IOT)
   #define BOARD_HAS_OFFLOADED_ECCX08
   #define HAS_TCP
 #endif
diff --git a/src/ArduinoIoTCloudTCP.cpp b/src/ArduinoIoTCloudTCP.cpp
index 4d6d294e4..7d1c96fc3 100644
--- a/src/ArduinoIoTCloudTCP.cpp
+++ b/src/ArduinoIoTCloudTCP.cpp
@@ -187,7 +187,6 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort)
     DEBUG_ERROR("CryptoUtil::readDeviceId(...) failed.");
     return 0;
   }
-  ECCX08.end();
   #endif
 
   #ifdef BOARD_HAS_ECCX08