diff --git a/hal/src/main/native/systemcore/FRCDriverStation.cpp b/hal/src/main/native/systemcore/FRCDriverStation.cpp
index fb13ed30c5..7539abcec8 100644
--- a/hal/src/main/native/systemcore/FRCDriverStation.cpp
+++ b/hal/src/main/native/systemcore/FRCDriverStation.cpp
@@ -177,7 +177,7 @@ struct SystemServerDriverStation {
         mrc::OpMode{"Test", mrc::OpModeHash::MakeTest(3)});
     testOpModes.Set(staticTestOpModes);
 
-    ntInst.AddListener(
+    controlDataListener = ntInst.AddListener(
         controlDataSubscriber, NT_EVENT_VALUE_REMOTE | NT_EVENT_UNPUBLISH,
         [this](const wpi::nt::Event& event) { HandleListener(event); });