diff --git a/nshlib/nsh_consolemain.c b/nshlib/nsh_consolemain.c
index 86f1214a5..14ca7c83b 100644
--- a/nshlib/nsh_consolemain.c
+++ b/nshlib/nsh_consolemain.c
@@ -101,7 +101,7 @@ int nsh_consolemain(int argc, char *argv[])
   usbtrace_enable(TRACE_BITSET);
 #endif
 
-#ifdef CONFIG_BOARDCTL_FINALINIT
+#if defined(CONFIG_NSH_ARCHINIT) && defined(CONFIG_BOARDCTL_FINALINIT)
   /* Perform architecture-specific final-initialization (if configured) */
 
   (void)boardctl(BOARDIOC_FINALINIT, 0);
diff --git a/nshlib/nsh_usbconsole.c b/nshlib/nsh_usbconsole.c
index be8dbc1e0..4d15578dc 100644
--- a/nshlib/nsh_usbconsole.c
+++ b/nshlib/nsh_usbconsole.c
@@ -317,7 +317,7 @@ int nsh_consolemain(int argc, char *argv[])
   (void)nsh_initscript(&pstate->cn_vtbl);
 #endif
 
-#ifdef CONFIG_BOARDCTL_FINALINIT
+#if defined(CONFIG_NSH_ARCHINIT) && defined(CONFIG_BOARDCTL_FINALINIT)
   /* Perform architecture-specific final-initialization (if configured) */
 
   (void)boardctl(BOARDIOC_FINALINIT, 0);
diff --git a/nshlib/nsh_usbkeyboard.c b/nshlib/nsh_usbkeyboard.c
index 7d0f69bb6..ab9a93bc6 100644
--- a/nshlib/nsh_usbkeyboard.c
+++ b/nshlib/nsh_usbkeyboard.c
@@ -210,7 +210,7 @@ int nsh_consolemain(int argc, char *argv[])
   (void)nsh_initscript(&pstate->cn_vtbl);
 #endif
 
-#ifdef CONFIG_BOARDCTL_FINALINIT
+#if defined(CONFIG_NSH_ARCHINIT) && defined(CONFIG_BOARDCTL_FINALINIT)
   /* Perform architecture-specific final-initialization (if configured) */
 
   (void)boardctl(BOARDIOC_FINALINIT, 0);