diff --git a/packages/sysutils/systemd/scripts/systemd-machine-id-setup b/packages/sysutils/systemd/scripts/systemd-machine-id-setup
index 0d45f5a29e..0b3c40ac25 100755
--- a/packages/sysutils/systemd/scripts/systemd-machine-id-setup
+++ b/packages/sysutils/systemd/scripts/systemd-machine-id-setup
@@ -34,8 +34,6 @@ elif [ -e "/sys/class/net/wlan0/address" ]; then
   MAC_ADRESS=`cat /sys/class/net/wlan0/address`
 fi
 
-if [ -n "$MAC_ADRESS" ]; then
-  MACHINEID=`echo $MAC_ADRESS | md5sum | cut -f1 -d" "`
-fi
+MACHINEID=`echo $MAC_ADRESS | md5sum | cut -f1 -d" "`
 
 echo "$MACHINEID" > /run/machine-id
diff --git a/packages/sysutils/systemd/system.d/machine-id.service b/packages/sysutils/systemd/system.d/machine-id.service
index 4e92ad9df2..8fa728ec8b 100644
--- a/packages/sysutils/systemd/system.d/machine-id.service
+++ b/packages/sysutils/systemd/system.d/machine-id.service
@@ -2,6 +2,7 @@
 Description=Setup machine-id
 DefaultDependencies=no
 After=local-fs.target
+Before=systemd-journald.service
 
 [Service]
 Type=oneshot