diff --git a/Kconfig b/Kconfig
index b73c604..c52f781 100644
--- a/Kconfig
+++ b/Kconfig
@@ -46,26 +46,6 @@ config TTN_RADIO_SX1276_77_78_79
 
 endchoice
 
-choice TTN_TIMER
-    prompt "Timer"
-    default TTN_TIMER_1_GROUP_0
-    help
-        A timer is used to implement the LoRaWAN protocol. This selects the ESP32's timer.
-
-config TTN_TIMER_0_GROUP_0
-    bool "Timer 0 of group 0"
-
-config TTN_TIMER_1_GROUP_0
-    bool "Timer 1 of group 0"
-
-config TTN_TIMER_0_GROUP_1
-    bool "Timer 0 of group 1"
-
-config TTN_TIMER_1_GROUP_1
-    bool "Timer 1 of group 1"
-
-endchoice
-
 config TTN_SPI_FREQ
     int "SPI frequency (in Hz)"
     default 10000000
diff --git a/esp_idf_lmic_config.h b/esp_idf_lmic_config.h
index f5d862d..e613b78 100755
--- a/esp_idf_lmic_config.h
+++ b/esp_idf_lmic_config.h
@@ -38,26 +38,6 @@
 #error TTN LoRa radio chip must be configured using 'make menuconfig'
 #endif
 
-#if defined(CONFIG_TTN_TIMER_0_GROUP_0)
-#define TTN_TIMER TIMER_0
-#define TTN_TIMER_GROUP TIMER_GROUP_0
-#define TTN_CLEAR_TIMER_ALARM TIMERG0.int_clr_timers.t0 = 1
-#elif defined(CONFIG_TTN_TIMER_1_GROUP_0)
-#define TTN_TIMER TIMER_1
-#define TTN_TIMER_GROUP TIMER_GROUP_0
-#define TTN_CLEAR_TIMER_ALARM TIMERG0.int_clr_timers.t1 = 1
-#elif defined(CONFIG_TTN_TIMER_0_GROUP_1)
-#define TTN_TIMER TIMER_0
-#define TTN_TIMER_GROUP TIMER_GROUP_1
-#define TTN_CLEAR_TIMER_ALARM TIMERG1.int_clr_timers.t0 = 1
-#elif defined(CONFIG_TTN_TIMER_1_GROUP_1)
-#define TTN_TIMER TIMER_1
-#define TTN_TIMER_GROUP TIMER_GROUP_1
-#define TTN_CLEAR_TIMER_ALARM TIMERG1.int_clr_timers.t1 = 1
-#else
-#error TTN timer must be configured using 'make menuconfig'
-#endif
-
 #if !defined(CONFIG_TTN_PROVISION_UART_NONE)
 #define TTN_HAS_AT_COMMANDS 1
 #if defined(CONFIG_TTN_PROVISION_UART_CONFIG_YES)
diff --git a/src/hal/hal_esp32.cpp b/src/hal/hal_esp32.cpp
index 83ee188..549ff3c 100755
--- a/src/hal/hal_esp32.cpp
+++ b/src/hal/hal_esp32.cpp
@@ -40,7 +40,7 @@ struct HALQueueItem
 // Constructor
 
 HAL_ESP32::HAL_ESP32()
-    : rssiCal(10), nextAlarm(0), isTimerArmed(false)
+    : rssiCal(10), nextAlarm(0)
 {    
 }
 
@@ -274,23 +274,17 @@ void HAL_ESP32::setNextAlarm(int64_t time)
 
 void HAL_ESP32::armTimer(int64_t espNow)
 {
-    if (isTimerArmed)
-        esp_timer_stop(timer);
     if (nextAlarm == 0)
         return;
     int64_t timeout = nextAlarm - esp_timer_get_time();
     if (timeout < 0)
         timeout = 10;
     esp_timer_start_once(timer, timeout);
-    isTimerArmed = true;
 }
 
 void HAL_ESP32::disarmTimer()
 {
-    if (!isTimerArmed)
-        return;
     esp_timer_stop(timer);
-    isTimerArmed = false;
 }
 
 void HAL_ESP32::timerCallback(void *arg)
diff --git a/src/hal/hal_esp32.h b/src/hal/hal_esp32.h
index 17cd8de..da5f3c3 100644
--- a/src/hal/hal_esp32.h
+++ b/src/hal/hal_esp32.h
@@ -87,7 +87,6 @@ private:
     SemaphoreHandle_t mutex;
     esp_timer_handle_t timer;
     int64_t nextAlarm;
-    bool isTimerArmed;
 };
 
 extern HAL_ESP32 ttn_hal;