diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index dea69a4652..f81e6672fb 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -146,11 +146,15 @@ else
 fi
 
 NOTOASTERUI=0
+WEBSERVER=1
 for param in $*; do
     case $param in
     noui )
             NOTOASTERUI=1
     ;;
+    noweb )
+            WEBSERVER=0
+    ;;
     esac
 done
 
@@ -176,7 +180,7 @@ case $CMD in
     start )
         start_success=1
         addtoConfiguration "INHERIT+=\"toaster buildhistory\"" toaster.conf
-        if ! webserverStartAll; then
+        if [ $WEBSERVER -gt 0 ] && ! webserverStartAll; then
             echo "Failed ${CMD}."
             return 4
         fi