diff --git a/drivers/pinctrl/pinctrl_stm32.c b/drivers/pinctrl/pinctrl_stm32.c
index 1334b47aefe..fa8481f114c 100644
--- a/drivers/pinctrl/pinctrl_stm32.c
+++ b/drivers/pinctrl/pinctrl_stm32.c
@@ -108,7 +108,7 @@ static int stm32_pins_remap(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt)
 	volatile uint32_t *reg;
 	uint16_t remap;
 
-	remap = (uint8_t)STM32_DT_PINMUX_REMAP(pins[0].pinmux);
+	remap = (uint16_t)STM32_DT_PINMUX_REMAP(pins[0].pinmux);
 
 	/* not remappable */
 	if (remap == NO_REMAP) {
diff --git a/drivers/pinmux/pinmux_stm32.c b/drivers/pinmux/pinmux_stm32.c
index a77f59ff3ae..86ab0d90880 100644
--- a/drivers/pinmux/pinmux_stm32.c
+++ b/drivers/pinmux/pinmux_stm32.c
@@ -219,7 +219,7 @@ int stm32_dt_pinctrl_remap(const struct soc_gpio_pinctrl *pinctrl,
 	volatile uint32_t *reg;
 	uint16_t remap;
 
-	remap = (uint8_t)STM32_DT_PINMUX_REMAP(pinctrl[0].pinmux);
+	remap = (uint16_t)STM32_DT_PINMUX_REMAP(pinctrl[0].pinmux);
 
 	/* not remappable */
 	if (remap == NO_REMAP) {