diff --git a/packaging/MSWindows/BUILD.sh b/packaging/MSWindows/BUILD.sh
index c309a2e643..85b868e079 100644
--- a/packaging/MSWindows/BUILD.sh
+++ b/packaging/MSWindows/BUILD.sh
@@ -538,6 +538,10 @@ for i in `seq 4`; do
 	find share/icons -type d -exec rmdir {} \; 2> /dev/null
 done
 
+if [ "${DO_FULL}" == "0" ]; then
+  rm qt.conf
+fi
+
 #leave ./dist
 popd > /dev/null
 
diff --git a/setup.py b/setup.py
index 4d7eeb4f3b..2dc1e0103b 100755
--- a/setup.py
+++ b/setup.py
@@ -2005,6 +2005,8 @@ def add_service_exe(script, icon, base_name) -> None:
 
     if qt6_client_ENABLED:
         external_includes.append("PyQt6")
+    else:
+        remove_packages("PyQt6")
 
     if shadow_ENABLED:
         external_includes.append("watchdog")