diff --git a/firmware/src/logic/dccd_force.cpp b/firmware/src/logic/dccd_force.cpp
index ae0493b..cedebe4 100644
--- a/firmware/src/logic/dccd_force.cpp
+++ b/firmware/src/logic/dccd_force.cpp
@@ -55,7 +55,7 @@ uint8_t logic::DccdForce::update(uint8_t user_force)
 	
 	// Determine target force source
 	uint8_t next_force = user_force;
-	if((this->handbrake->state == hw::BUTTON_ON)&&(this->handbrake->time < this->max_hbrake_time))
+	if((this->handbrake->state == hw::BUTTON_ON)&&((this->handbrake->time < this->max_hbrake_time)||(this->max_hbrake_time == 0)))
 	{
 		next_force = 0;
 	}