diff --git a/conf/settings/tuning.xml b/conf/settings/tuning.xml
index c430c97e34..cf1fcb3f4c 100644
--- a/conf/settings/tuning.xml
+++ b/conf/settings/tuning.xml
@@ -32,8 +32,8 @@
     <dl_settings NAME="control">
 
       <dl_settings NAME="trim">
-        <dl_setting MAX="3000" MIN="-3000" STEP="1" VAR="command_roll_trim" shortname="roll_trim" module="commands" param="COMMAND_ROLL_TRIM"/>
-        <dl_setting MAX="3000" MIN="-3000" STEP="1" VAR="command_pitch_trim" shortname="pitch_trim" param="COMMAND_PITCH_TRIM"/>
+        <dl_setting MAX="960" MIN="-960" STEP="1" VAR="command_roll_trim" shortname="roll_trim" module="commands" param="COMMAND_ROLL_TRIM"/>
+        <dl_setting MAX="960" MIN="-960" STEP="1" VAR="command_pitch_trim" shortname="pitch_trim" param="COMMAND_PITCH_TRIM"/>
       </dl_settings>
 
       <dl_settings NAME="attitude">
diff --git a/conf/settings/tuning_ins.xml b/conf/settings/tuning_ins.xml
index 0a5aea0529..0aa57141ef 100644
--- a/conf/settings/tuning_ins.xml
+++ b/conf/settings/tuning_ins.xml
@@ -32,8 +32,8 @@
     <dl_settings NAME="control">
 
       <dl_settings NAME="trim">
-        <dl_setting MAX="3000" MIN="-3000" STEP="1" VAR="command_roll_trim" shortname="roll_trim" module="commands" param="COMMAND_ROLL_TRIM"/>
-        <dl_setting MAX="3000" MIN="-3000" STEP="1" VAR="command_pitch_trim" shortname="pitch_trim" param="COMMAND_PITCH_TRIM"/>
+        <dl_setting MAX="960" MIN="-960" STEP="1" VAR="command_roll_trim" shortname="roll_trim" module="commands" param="COMMAND_ROLL_TRIM"/>
+        <dl_setting MAX="960" MIN="-960" STEP="1" VAR="command_pitch_trim" shortname="pitch_trim" param="COMMAND_PITCH_TRIM"/>
       </dl_settings>
 
       <dl_settings NAME="ins">
diff --git a/sw/airborne/firmwares/fixedwing/main_fbw.c b/sw/airborne/firmwares/fixedwing/main_fbw.c
index e5e2ffc5b5..318126b599 100644
--- a/sw/airborne/firmwares/fixedwing/main_fbw.c
+++ b/sw/airborne/firmwares/fixedwing/main_fbw.c
@@ -155,10 +155,10 @@ void event_task_fbw( void) {
     for(i = 0; i < COMMANDS_NB; i++) trimmed_commands[i] = commands[i];
 
     #ifdef COMMAND_ROLL
-    trimmed_commands[COMMAND_ROLL] += command_roll_trim;
+    trimmed_commands[COMMAND_ROLL] += ChopAbs(command_roll_trim, MAX_PPRZ/10);
     #endif
     #ifdef COMMAND_PITCH
-    trimmed_commands[COMMAND_PITCH] += command_pitch_trim;
+    trimmed_commands[COMMAND_PITCH] += ChopAbs(command_pitch_trim, MAX_PPRZ/10);
     #endif
 
     SetActuatorsFromCommands(trimmed_commands);