diff --git a/headers/private/kernel/syscall_restart.h b/headers/private/kernel/syscall_restart.h
index fd9d93879b..fd765a1ed1 100644
--- a/headers/private/kernel/syscall_restart.h
+++ b/headers/private/kernel/syscall_restart.h
@@ -51,7 +51,7 @@ syscall_restart_handle_timeout_pre(uint32& flags, bigtime_t& timeout)
 		if (timeout > 0 && (flags & B_RELATIVE_TIMEOUT) != 0)
 			flags = (flags & ~B_RELATIVE_TIMEOUT) | B_ABSOLUTE_TIMEOUT;
 	} else if ((flags & B_RELATIVE_TIMEOUT) != 0) {
-		if (timeout > 0 && timeout < B_INFINITE_TIMEOUT) {
+		if (timeout > 0 && timeout != B_INFINITE_TIMEOUT) {
 			timeout += system_time();
 			// deal with overflow
 			if (timeout < 0)
diff --git a/src/system/kernel/thread.cpp b/src/system/kernel/thread.cpp
index b243802bc0..7cf4e9c31d 100644
--- a/src/system/kernel/thread.cpp
+++ b/src/system/kernel/thread.cpp
@@ -2963,7 +2963,7 @@ thread_block_with_timeout(uint32 timeoutFlags, bigtime_t timeout)
 		return thread->wait.status;
 
 	bool useTimer = (timeoutFlags & (B_RELATIVE_TIMEOUT | B_ABSOLUTE_TIMEOUT)) != 0
-		&& timeout < B_INFINITE_TIMEOUT;
+		&& timeout != B_INFINITE_TIMEOUT;
 
 	if (useTimer) {
 		// Timer flags: absolute/relative.