diff --git a/recipes-connectivity/wwan-config/wwan-config.bb b/recipes-connectivity/wwan-config/wwan-config.bb
index c284def..71c5a7c 100644
--- a/recipes-connectivity/wwan-config/wwan-config.bb
+++ b/recipes-connectivity/wwan-config/wwan-config.bb
@@ -39,12 +39,15 @@ do_install_append() {
     install -m 0644 ${WORKDIR}/wwan-config@.service ${D}/${systemd_unitdir}/system/
 
     install -d ${D}/${sysconfdir}/wwan
-    if [ ! -z "${WWAN_NBR}" ] && [ "${SYSTEMD_AUTO_ENABLE}" = "enable" ] ; then
+    if [ ! -z "${WWAN_NBR}" ] ; then
         install -d ${D}${sysconfdir}/systemd/system/ModemManager.service.requires/
         for i in `seq 0 ${WWAN_NBR}`; do 
             if [ $i = ${WWAN_NBR} ]; then continue; fi
-            ln -sf ${systemd_unitdir}/system/wwan-config@.service \
+
+            if [ "${SYSTEMD_AUTO_ENABLE}" = "enable" ] ; then
+                ln -sf ${systemd_unitdir}/system/wwan-config@.service \
                     ${D}${sysconfdir}/systemd/system/ModemManager.service.requires/wwan-config@wwan$i.service
+            fi
 
             install -m 0644 ${WORKDIR}/default.conf ${D}${sysconfdir}/wwan/wwan$i.conf
         done