diff --git a/src/hci/shell_banner.c b/src/hci/shell_banner.c
index 8d2a5d0c..07c0fa4a 100644
--- a/src/hci/shell_banner.c
+++ b/src/hci/shell_banner.c
@@ -41,10 +41,11 @@ int shell_banner ( void ) {
 	int wait_count;
 	int key;
 
-	if ( BANNER_TIMEOUT <=  0 ) {
-		return enter_shell;
-	}
+	/* Skip prompt if timeout is zero */
+	if ( BANNER_TIMEOUT <= 0 )
+		return 0;
 
+	/* Display prompt */
 	printf ( "\nPress Ctrl-B for the iPXE command line..." );
 
 	/* Wait for key */