diff --git a/sys/pm_layered/pm.c b/sys/pm_layered/pm.c
index c14217d60ea3..2a44712c8586 100644
--- a/sys/pm_layered/pm.c
+++ b/sys/pm_layered/pm.c
@@ -82,8 +82,9 @@ void pm_unblock(unsigned mode)
 #ifndef PROVIDES_PM_LAYERED_OFF
 void pm_off(void)
 {
-    pm_blocker.val_u32 = 0;
-    pm_set_lowest();
-    while(1) {}
+    irq_disable();
+    while(1) {
+        pm_set(0);
+    }
 }
 #endif