diff --git a/oe-init-build-env-memres b/oe-init-build-env-memres
index dca819b2eb..79b91b751a 100755
--- a/oe-init-build-env-memres
+++ b/oe-init-build-env-memres
@@ -42,6 +42,10 @@ else
    else
       OEROOT="`pwd`"
    fi
+   if [ -n "$BBSERVER" ]; then
+      unset BBSERVER
+   fi
+            
    OEROOT=`readlink -f "$OEROOT"`
    export OEROOT
    . $OEROOT/scripts/oe-buildenv-internal && \