diff --git a/src/hci/shell_banner.c b/src/hci/shell_banner.c
index 8afefe3d..dbe37673 100644
--- a/src/hci/shell_banner.c
+++ b/src/hci/shell_banner.c
@@ -41,6 +41,10 @@ int shell_banner ( void ) {
 	int wait_count;
 	int key;
 
+	if ( BANNER_TIMEOUT <=  0 ) {
+		return enter_shell;
+	}
+
 	printf ( "\nPress Ctrl-B for the gPXE command line..." );
 
 	/* Wait for key */