diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/init.c b/bacnet-stack/ports/bdk-atxx4-mstp/init.c
index d762aa36..64848bb6 100644
--- a/bacnet-stack/ports/bdk-atxx4-mstp/init.c
+++ b/bacnet-stack/ports/bdk-atxx4-mstp/init.c
@@ -58,6 +58,6 @@ void init(
     DDRD = 0;
     PORTD = 0;
     /* Configure the watchdog timer - Disabled for testing */
-    BIT_CLEAR(MCUSR, WDRF);
-    WDTCSR = 0;
+    /* wdt_enable(WDTO_2S); */
+    wdt_disable();    
 }
diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/main.c b/bacnet-stack/ports/bdk-atxx4-mstp/main.c
index 2b9ec178..793cd740 100644
--- a/bacnet-stack/ports/bdk-atxx4-mstp/main.c
+++ b/bacnet-stack/ports/bdk-atxx4-mstp/main.c
@@ -231,6 +231,7 @@ int main(
     /* Enable global interrupts */
     __enable_interrupt();
     for (;;) {
+        wdt_reset();
         input_task();
         bacnet_task();
         led_task();