diff --git a/src/mavsdk/plugins/camera/camera_impl.cpp b/src/mavsdk/plugins/camera/camera_impl.cpp
index 1357d379b..a8dde50fa 100644
--- a/src/mavsdk/plugins/camera/camera_impl.cpp
+++ b/src/mavsdk/plugins/camera/camera_impl.cpp
@@ -1252,6 +1252,8 @@ void CameraImpl::process_camera_information(const mavlink_message_t& message)
     camera_information.cam_definition_uri[sizeof(camera_information.cam_definition_uri) - 1] = '\0';
 
     Camera::Information new_information{};
+    // TODO: Check the case for 1-6.
+    new_information.component_id = message.compid;
     new_information.vendor_name = reinterpret_cast<char*>(camera_information.vendor_name);
     new_information.model_name = reinterpret_cast<char*>(camera_information.model_name);
     new_information.focal_length_mm = camera_information.focal_length;
@@ -1274,7 +1276,7 @@ void CameraImpl::process_camera_information(const mavlink_message_t& message)
     }
 
     // We need a copy of the component ID inside the information.
-    new_information.component_id = potential_camera->component_id;
+    potential_camera->component_id = new_information.component_id;
     potential_camera->maybe_information = new_information;
     potential_camera->camera_definition_url = camera_information.cam_definition_uri;
     potential_camera->camera_definition_version = camera_information.cam_definition_version;