diff --git a/src/platform/baytrail/timer.c b/src/platform/baytrail/timer.c
index 9256dd937..3397ef0e4 100644
--- a/src/platform/baytrail/timer.c
+++ b/src/platform/baytrail/timer.c
@@ -66,7 +66,7 @@ static void platform_timer_64_handler(void *arg)
 	}
 
 	/* get next timeout value */
-	if (timer->hitimeout > 0 && timer->hitimeout == timer->hitime) {
+	if (timer->hitimeout == timer->hitime) {
 		/* timeout is in this 32 bit period */
 		timeout = timer->lowtimeout;
 	} else {
@@ -108,17 +108,13 @@ int platform_timer_set(struct timer *timer, uint64_t ticks)
 	flags = arch_interrupt_global_disable();
 
 	/* same hi 64 bit context as ticks ? */
-	if (hitimeout == timer->hitime) {
-		/* yes, then set the value for next timeout */
-		time = ticks;
-		timer->lowtimeout = 0;
-		timer->hitimeout = 0;
-	} else if (hitimeout < timer->hitime) {
+	if (hitimeout < timer->hitime) {
 		/* cant be in the past */
 		arch_interrupt_global_enable(flags);
 		return -EINVAL;
 	} else {
 		/* set for checking at next timeout */
+		time = ticks;
 		timer->hitimeout = hitimeout;
 		timer->lowtimeout = ticks;
 	}