diff --git a/configs/stm32f4discovery/src/stm32_nsh.c b/configs/stm32f4discovery/src/stm32_nsh.c
index 3692071bb0..037fced44d 100644
--- a/configs/stm32f4discovery/src/stm32_nsh.c
+++ b/configs/stm32f4discovery/src/stm32_nsh.c
@@ -64,11 +64,13 @@
 
 int nsh_archinitialize(void)
 {
-#ifndef CONFIG_BOARD_INITIALIZE
-  /* Perform board-specific initialization */
-
-  (void)stm32_bringup();
-#endif
+#ifdef CONFIG_BOARD_INITIALIZE
+  /* Board initialization already performed by board_initialize() */
 
   return OK;
+#else
+  /* Perform board-specific initialization */
+
+  return stm32_bringup();
+#endif
 }