diff --git a/src/modules/camera_feedback/CameraFeedback.cpp b/src/modules/camera_feedback/CameraFeedback.cpp
index 35ac09296d..029773541c 100644
--- a/src/modules/camera_feedback/CameraFeedback.cpp
+++ b/src/modules/camera_feedback/CameraFeedback.cpp
@@ -70,27 +70,28 @@ CameraFeedback::Run()
 
 	camera_trigger_s trig{};
 
-	while (_trigger_sub.update(&trig)) {
+	vehicle_attitude_s att{};
 
+	while (_att_sub.update(&att)) {
 		// update geotagging subscriptions
 		vehicle_global_position_s gpos{};
 		_gpos_sub.copy(&gpos);
 
-		vehicle_attitude_s att{};
 		_att_sub.copy(&att);
+		_trigger_sub.copy(&trig);
 
-		if (trig.timestamp == 0 ||
-		    gpos.timestamp == 0 ||
-		    att.timestamp == 0) {
+		// if (trig.timestamp == 0 ||
+		//     gpos.timestamp == 0 ||
+		//     att.timestamp == 0) {
 
-			// reject until we have valid data
-			continue;
-		}
+		// 	// reject until we have valid data
+		// 	continue;
+		// }
 
-		if ((_cam_cap_fback >= 1) && !trig.feedback) {
-			// Ignore triggers that are not feedback when camera capture feedback is enabled
-			continue;
-		}
+		// if ((_cam_cap_fback >= 1) && !trig.feedback) {
+		// 	// Ignore triggers that are not feedback when camera capture feedback is enabled
+		// 	continue;
+		// }
 
 		camera_capture_s capture{};
 
diff --git a/src/modules/logger/logged_topics.cpp b/src/modules/logger/logged_topics.cpp
index 31ea1bad68..6a2b422bf4 100644
--- a/src/modules/logger/logged_topics.cpp
+++ b/src/modules/logger/logged_topics.cpp
@@ -51,7 +51,7 @@ void LoggedTopics::add_default_topics()
 	add_topic("airspeed", 1000);
 	add_optional_topic("airspeed_validated", 200);
 	add_optional_topic("autotune_attitude_control_status", 100);
-	add_optional_topic("camera_capture");
+	add_topic("camera_capture");
 	add_optional_topic("camera_trigger");
 	add_topic("cellular_status", 200);
 	add_topic("commander_state");