diff --git a/sw/airborne/booz/booz2_cam.c b/sw/airborne/booz/booz2_cam.c
index 03404aee89..55c1d8ed79 100644
--- a/sw/airborne/booz/booz2_cam.c
+++ b/sw/airborne/booz/booz2_cam.c
@@ -48,6 +48,7 @@ void booz2_cam_init(void) {
 #ifdef BOOZ2_CAM_PAN_NEUTRAL
   booz2_cam_pan = BOOZ2_CAM_PAN_NEUTRAL;
 #endif
+  LED_ON(CAM_SWITCH_LED);
 }
 
 void booz2_cam_periodic(void) {
@@ -65,7 +66,7 @@ void booz2_cam_periodic(void) {
     case BOOZ2_CAM_MODE_HEADING:
 #if defined BOOZ2_CAM_TILT_MIN && defined BOOZ2_CAM_TILT_MAX
       Bound(booz2_cam_tilt,BOOZ2_CAM_TILT_MIN,BOOZ2_CAM_TILT_MAX);
-      Booz2SetPwmValue(booz2_cam_tilt);
+      //Booz2SetPwmValue(booz2_cam_tilt);
 #endif
 #if defined BOOZ2_CAM_PAN_MIN && defined BOOZ2_CAM_PAN_MAX
       //Bound(booz2_cam_pan,BOOZ2_CAM_PAN_MIN,BOOZ2_CAM_PAN_MAX);
diff --git a/sw/airborne/booz/booz2_cam.h b/sw/airborne/booz/booz2_cam.h
index 27ceb6004e..e4724a16f6 100644
--- a/sw/airborne/booz/booz2_cam.h
+++ b/sw/airborne/booz/booz2_cam.h
@@ -27,6 +27,7 @@
 
 #include "airframe.h"
 #include "std.h"
+#include "led.h"
 
 #define BOOZ2_CAM_MODE_NONE     0
 #define BOOZ2_CAM_MODE_MANUAL   1
@@ -45,5 +46,11 @@ extern int16_t booz2_cam_pan;
 extern void booz2_cam_init(void);
 extern void booz2_cam_periodic(void);
 
+#define booz2_cam_SetCamMode(_v) { \
+  booz2_cam_mode = _v; \
+  if (booz2_cam_mode == BOOZ2_CAM_MODE_NONE) { LED_ON(CAM_SWITCH_LED); } \
+  else { LED_OFF(CAM_SWITCH_LED); } \
+}
+
 #endif /* BOOZ2_CAM_H */