diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index 6dd20c11d1..7cecc7b3cd 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -159,12 +159,7 @@ fi
 BBBASEDIR=`dirname $TOASTER`/..
 MANAGE=$BBBASEDIR/lib/toaster/manage.py
 OEROOT=`dirname $TOASTER`/../..
-NOTOASTERUI=0
-WEBSERVER=1
-TOASTER_BRBE=""
-if [ "$WEB_PORT" = "" ]; then
-    WEB_PORT="8000"
-fi
+
 # this is the configuraton file we are using for toaster
 # we are using the same logic that oe-setup-builddir uses
 # (based on TEMPLATECONF and .templateconf) to determine
@@ -206,7 +201,11 @@ fi
 # make sure that the toaster.sqlite file doesn't default to `pwd` like it currently does.
 export TOASTER_DIR=`pwd`
 
+NOTOASTERUI=0
+WEBSERVER=1
 NOBROWSER=0
+TOASTER_BRBE=""
+WEB_PORT="8000"
 
 for param in $*; do
     case $param in