diff --git a/wpilibc/athena/src/PIDController.cpp b/wpilibc/athena/src/PIDController.cpp
index 970a8159ab..58a1085b48 100644
--- a/wpilibc/athena/src/PIDController.cpp
+++ b/wpilibc/athena/src/PIDController.cpp
@@ -78,6 +78,8 @@ void PIDController::Initialize(float Kp, float Ki, float Kd, float Kf,
 }
 
 PIDController::~PIDController() {
+  //forcefully stopping the notifier so the callback can successfully run. 
+  m_controlLoop->Stop();
   if (m_table != nullptr) m_table->RemoveTableListener(this);
 }