diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 222dabddbc..21a6c8144a 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -297,8 +297,6 @@ def main():
         server = servermodule.BitBakeXMLRPCClient(configParams.observe_only)
         server.saveConnectionDetails(configParams.remote_server)
 
-    logger.removeHandler(handler)
-
     if not configParams.server_only:
         # Collect the feature set for the UI
         featureset = getattr(ui_module, "featureSet", [])
@@ -310,6 +308,8 @@ def main():
         for k in cleanedvars:
             os.environ[k] = cleanedvars[k]
 
+        logger.removeHandler(handler)
+
         try:
             return ui_module.main(server_connection.connection, server_connection.events, configParams)
         finally: