diff --git a/targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/CMSIS/stm32g431xx.h b/targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/CMSIS/stm32g431xx.h
index 100406bf34..3d5bb7fa9c 100644
--- a/targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/CMSIS/stm32g431xx.h
+++ b/targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/CMSIS/stm32g431xx.h
@@ -9604,9 +9604,10 @@ typedef struct
 #define SYSCFG_MEMRMP_MEM_MODE_1        (0x2UL << SYSCFG_MEMRMP_MEM_MODE_Pos)  /*!< 0x00000002 */
 #define SYSCFG_MEMRMP_MEM_MODE_2        (0x4UL << SYSCFG_MEMRMP_MEM_MODE_Pos)  /*!< 0x00000004 */
 
-#define SYSCFG_MEMRMP_FB_MODE_Pos       (8U)
-#define SYSCFG_MEMRMP_FB_MODE_Msk       (0x1UL << SYSCFG_MEMRMP_FB_MODE_Pos)   /*!< 0x00000100 */
-#define SYSCFG_MEMRMP_FB_MODE           SYSCFG_MEMRMP_FB_MODE_Msk              /*!< User Flash Bank mode selection */
+// Commented out because G431KB only has one Flash Bank
+// #define SYSCFG_MEMRMP_FB_MODE_Pos       (8U)
+// #define SYSCFG_MEMRMP_FB_MODE_Msk       (0x1UL << SYSCFG_MEMRMP_FB_MODE_Pos)   /*!< 0x00000100 */
+// #define SYSCFG_MEMRMP_FB_MODE           SYSCFG_MEMRMP_FB_MODE_Msk              /*!< User Flash Bank mode selection */
 
 /******************  Bit definition for SYSCFG_CFGR1 register ******************/
 #define SYSCFG_CFGR1_BOOSTEN_Pos        (8U)
diff --git a/targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/STM32G4xx_HAL_Driver/stm32g4xx_hal.c b/targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/STM32G4xx_HAL_Driver/stm32g4xx_hal.c
index 304cef8955..5ff8db011a 100644
--- a/targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/STM32G4xx_HAL_Driver/stm32g4xx_hal.c
+++ b/targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/STM32G4xx_HAL_Driver/stm32g4xx_hal.c
@@ -595,7 +595,9 @@ void HAL_SYSCFG_CCMSRAMErase(void)
   */
 void HAL_SYSCFG_EnableMemorySwappingBank(void)
 {
+  #if defined(SYSCFG_MEMRMP_FB_MODE)
   SET_BIT(SYSCFG->MEMRMP, SYSCFG_MEMRMP_FB_MODE);
+  #endif
 }
 
 /**
@@ -610,7 +612,9 @@ void HAL_SYSCFG_EnableMemorySwappingBank(void)
   */
 void HAL_SYSCFG_DisableMemorySwappingBank(void)
 {
+  #if defined(SYSCFG_MEMRMP_FB_MODE)
   CLEAR_BIT(SYSCFG->MEMRMP, SYSCFG_MEMRMP_FB_MODE);
+  #endif
 }
 
 #if defined(VREFBUF)