diff --git a/board/cr50/board.h b/board/cr50/board.h
index edbfe263f2..e0c38c6b2e 100644
--- a/board/cr50/board.h
+++ b/board/cr50/board.h
@@ -31,7 +31,7 @@
 #undef CONFIG_CMD_CRASH
 #undef CONFIG_CMD_MD
 #undef CONFIG_CMD_RW
-#undef CONFIG_CMD_SLEEPMASK
+#undef CONFIG_CMD_SLEEPMASK_SET
 #undef CONFIG_CMD_WAITMS
 #undef CONFIG_FLASH
 #endif
diff --git a/common/system.c b/common/system.c
index 65c1d16681..64bfabbbc2 100644
--- a/common/system.c
+++ b/common/system.c
@@ -1224,6 +1224,7 @@ DECLARE_SAFE_CONSOLE_COMMAND(syslock, command_system_lock,
  */
 static int command_sleepmask(int argc, char **argv)
 {
+#ifdef CONFIG_CMD_SLEEPMASK_SET
 	int v;
 
 	if (argc >= 2) {
@@ -1242,14 +1243,14 @@ static int command_sleepmask(int argc, char **argv)
 			sleep_mask = v;
 		}
 	}
-
+#endif
 	ccprintf("sleep mask: %08x\n", sleep_mask);
 
 	return EC_SUCCESS;
 }
-DECLARE_CONSOLE_COMMAND(sleepmask, command_sleepmask,
-			"[ on | off | <sleep_mask>]",
-			"Display/force sleep mask");
+DECLARE_SAFE_CONSOLE_COMMAND(sleepmask, command_sleepmask,
+			     "[ on | off | <sleep_mask>]",
+			     "Display/force sleep mask");
 #endif
 
 #ifdef CONFIG_CMD_JUMPTAGS
diff --git a/include/config.h b/include/config.h
index 1c1a56af1c..4511fb39ea 100644
--- a/include/config.h
+++ b/include/config.h
@@ -876,6 +876,7 @@
 #define CONFIG_CMD_SHMEM
 #undef  CONFIG_CMD_SLEEP
 #define CONFIG_CMD_SLEEPMASK
+#define CONFIG_CMD_SLEEPMASK_SET
 #undef  CONFIG_CMD_SPI_FLASH
 #undef  CONFIG_CMD_SPI_NOR
 #undef  CONFIG_CMD_SPI_XFER