diff --git a/src/drivers/boards/px4fmu-v4/board_config.h b/src/drivers/boards/px4fmu-v4/board_config.h
index 433f3024bc..fde9eb7dae 100644
--- a/src/drivers/boards/px4fmu-v4/board_config.h
+++ b/src/drivers/boards/px4fmu-v4/board_config.h
@@ -166,6 +166,13 @@
 #define ADC_5V_RAIL_SENSE				4
 #define ADC_RC_RSSI_CHANNEL				11
 
+/* Define Battery 1 Voltage Divider and A per V
+ */
+
+#define BOARD_BATTERY1_V_DIV (13.653333333f)
+#define BOARD_BATTERY1_A_PER_V (36.367515152f)
+
+
 /* User GPIOs
  *
  * GPIO0-5 are the PWM servo outputs.
diff --git a/src/modules/sensors/parameters.cpp b/src/modules/sensors/parameters.cpp
index 20c047b40c..d6df5296ec 100644
--- a/src/modules/sensors/parameters.cpp
+++ b/src/modules/sensors/parameters.cpp
@@ -419,9 +419,7 @@ int update_parameters(const ParameterHandles &parameter_handles, Parameters &par
 
 		parameters.battery_v_div = BOARD_BATTERY1_V_DIV;
 
-#if defined (CONFIG_ARCH_BOARD_PX4FMU_V4)
-		parameters.battery_v_div = 13.653333333f;
-#elif defined (CONFIG_ARCH_BOARD_PX4FMU_V2) || defined ( CONFIG_ARCH_BOARD_MINDPX_V2 )
+#if defined (CONFIG_ARCH_BOARD_PX4FMU_V2) || defined ( CONFIG_ARCH_BOARD_MINDPX_V2 )
 		parameters.battery_v_div = 10.177939394f;
 #elif defined (CONFIG_ARCH_BOARD_AEROCORE)
 		parameters.battery_v_div = 7.8196363636f;
@@ -440,11 +438,7 @@ int update_parameters(const ParameterHandles &parameter_handles, Parameters &par
 
 		parameters.battery_a_per_v = BOARD_BATTERY1_A_PER_V;
 
-#if defined (CONFIG_ARCH_BOARD_PX4FMU_V4)
-		/* current scaling for ACSP4 */
-		parameters.battery_a_per_v = 36.367515152f;
-
-#elif defined (CONFIG_ARCH_BOARD_PX4FMU_V2) || defined (CONFIG_ARCH_BOARD_MINDPX_V2) || defined (CONFIG_ARCH_BOARD_AEROCORE) || defined (CONFIG_ARCH_BOARD_PX4FMU_V1)
+#if defined (CONFIG_ARCH_BOARD_PX4FMU_V2) || defined (CONFIG_ARCH_BOARD_MINDPX_V2) || defined (CONFIG_ARCH_BOARD_AEROCORE) || defined (CONFIG_ARCH_BOARD_PX4FMU_V1)
 		/* current scaling for 3DR power brick */
 		parameters.battery_a_per_v = 15.391030303f;
 #endif