diff --git a/libfreerdp/core/connection.c b/libfreerdp/core/connection.c
index d599c3bce..53ce1f6dd 100644
--- a/libfreerdp/core/connection.c
+++ b/libfreerdp/core/connection.c
@@ -1584,7 +1584,9 @@ BOOL rdp_server_reactivate(rdpRdp* rdp)
 	rdp_finalize_set_flag(rdp, FINALIZE_DEACTIVATE_REACTIVATE);
 	if (!rdp_server_transition_to_state(rdp, CONNECTION_STATE_CAPABILITIES_EXCHANGE_DEMAND_ACTIVE))
 		return FALSE;
-	return rdp_peer_handle_state_demand_active(client) > 0;
+
+	state_run_t rc = rdp_peer_handle_state_demand_active(client);
+	return state_run_success(rc);
 }
 
 BOOL rdp_server_transition_to_state(rdpRdp* rdp, CONNECTION_STATE state)
diff --git a/libfreerdp/core/peer.h b/libfreerdp/core/peer.h
index 57cecce6c..f405d9b14 100644
--- a/libfreerdp/core/peer.h
+++ b/libfreerdp/core/peer.h
@@ -26,6 +26,6 @@
 
 #include <freerdp/peer.h>
 
-FREERDP_LOCAL int rdp_peer_handle_state_demand_active(freerdp_peer* client);
+FREERDP_LOCAL state_run_t rdp_peer_handle_state_demand_active(freerdp_peer* client);
 
 #endif /* FREERDP_LIB_CORE_PEER_H */