diff --git a/device/testing/device-nokia-n900/device-nokia-n900.post-install b/device/testing/device-nokia-n900/device-nokia-n900.post-install
index 4f08c5bdc..1143dbafe 100644
--- a/device/testing/device-nokia-n900/device-nokia-n900.post-install
+++ b/device/testing/device-nokia-n900/device-nokia-n900.post-install
@@ -11,6 +11,8 @@ rc-update add acpid default
 rc-update add hwdrivers boot
 # Enable ofono
 rc-update add ofono default
+# Enable swclock
+rc-update -q add swclock boot
 
 # Load nokia-modem module on boot
 NMC=/etc/modules-load.d/nokia-modem.conf
@@ -23,11 +25,6 @@ if [ -z "$(grep /dev/rtc0 /etc/conf.d/hwclock)" ]; then
         sed -i 's/clock_args=\"/clock_args=\" -f \/dev\/rtc/' /etc/conf.d/hwclock
 fi
 
-exit 0
-
-# Enable swclock OpenRC service
-rc-update -q add swclock boot
-
 # Prime swclock with a reasonable date/time on first boot
 mkdir -p /run/openrc
 touch /run/openrc/shutdowntime