diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index 3b5b7f868b..6d1ec0573a 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -128,6 +128,10 @@ stop_system()
     fi
     stop_bitbake
     webserverKillAll
+    # unset exported variables
+    unset DATABASE_URL
+    unset TOASTER_CONF
+    unset TOASTER_DIR
     trap - SIGHUP
     #trap - SIGCHLD
     INSTOPSYSTEM=0