diff --git a/src/arch/msp430fr5994lp/arch.cc b/src/arch/msp430fr5994lp/arch.cc
index 2e57a5f338620f8dc71d2f37635772f15af921a0..de75fbb8fb2590fb15ae98e7c68a276791099ce6 100644
--- a/src/arch/msp430fr5994lp/arch.cc
+++ b/src/arch/msp430fr5994lp/arch.cc
@@ -131,6 +131,9 @@ volatile bool sleep_done = false;
 // max delay: 524 ms @  8 MHz
 void Arch::sleep_ms(unsigned int const ms)
 {
+	if (ms == 0) {
+		return;
+	}
 	sleep_done = false;
 #if F_CPU == 16000000UL
 	TA3CTL = TASSEL__SMCLK | ID__8; // /8