diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh
index f0fcd1c..47714c5 100644
--- a/lib/util-yaml.sh
+++ b/lib/util-yaml.sh
@@ -296,8 +296,12 @@ write_settings_conf(){
     fi
     # WIP - OfficeChooser
     if ${extra}; then
-        msg2 "Enabling PackageChooser module."
-        echo "        - packagechooser" >> "$conf"
+        if ${oem_used}; then
+            msg2 "Skipping enabling PackageChooser module."
+        else
+            msg2 "Enabling PackageChooser module."
+            echo "        - packagechooser" >> "$conf"
+        fi
     fi
     if ${netinstall}; then
         echo "        - netinstall" >> "$conf" && write_netinstall_conf