diff --git a/libs/BehaviorKit/source/BehaviorKit.cpp b/libs/BehaviorKit/source/BehaviorKit.cpp
index 6dfc74ca1f..100a2824ec 100644
--- a/libs/BehaviorKit/source/BehaviorKit.cpp
+++ b/libs/BehaviorKit/source/BehaviorKit.cpp
@@ -27,11 +27,10 @@ void BehaviorKit::start(interface::Behavior *behavior)
 {
 	stop();
 
-	_behavior = behavior;
-
-	if (_behavior == nullptr) {
+	if (behavior == nullptr) {
 		return;
 	}
+	_behavior = *std::find(std::begin(_behaviors), std::end(_behaviors), behavior);	  // TODO: can't be null
 
 	_event_loop.start();
 	if (_timeout_duration != std::chrono::seconds {0}) {