diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index aad26a0f1e..995089a384 100644
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -575,6 +575,7 @@ def preserved_envvars_exported():
         'TERM',
         'USER',
         'LC_ALL',
+        'BBSERVER',
     ]
 
 def preserved_envvars():