diff --git a/src/libs/compat/freebsd_network/Condvar.cpp b/src/libs/compat/freebsd_network/Condvar.cpp
index 76aadcafb8..e4a6b45d04 100644
--- a/src/libs/compat/freebsd_network/Condvar.cpp
+++ b/src/libs/compat/freebsd_network/Condvar.cpp
@@ -64,9 +64,14 @@ int
 publishedConditionTimedWait(const void* waitChannel, const int timeout)
 {
 	ConditionVariableEntry variableEntry;
+	bigtime_t usecs = ticks_to_usecs(timeout);
 
+	// FreeBSD has a condition-variable scheduling system with different
+	// scheduling semantics than ours does. As a result, it seems there are
+	// some scenarios which work fine under FreeBSD but race into a deadlock
+	// on Haiku. To avoid this, turn unlimited timeouts into 1sec ones.
 	status_t status = variableEntry.Wait(waitChannel, B_RELATIVE_TIMEOUT,
-		ticks_to_usecs(timeout));
+		usecs > 0 ? usecs : 1000 * 1000);
 
 	if (status != B_OK)
 		status = EWOULDBLOCK;