diff --git a/cpp/src/mavsdk/plugins/camera_server/camera_server_impl.cpp b/cpp/src/mavsdk/plugins/camera_server/camera_server_impl.cpp
index b13aeb5a71..b98280cf46 100644
--- a/cpp/src/mavsdk/plugins/camera_server/camera_server_impl.cpp
+++ b/cpp/src/mavsdk/plugins/camera_server/camera_server_impl.cpp
@@ -16,6 +16,7 @@ CameraServerImpl::CameraServerImpl(std::shared_ptr<ServerComponent> server_compo
 
 CameraServerImpl::~CameraServerImpl()
 {
+    stop_sending_tracking_status();
     _server_component_impl->unregister_plugin(this);
 }