diff --git a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.conf b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.conf
index 50d00823..829861f7 100644
--- a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.conf
+++ b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.conf
@@ -45,8 +45,6 @@ CONFIG_DEBUG_COREDUMP_BACKEND_OTHER=y
 CONFIG_RTC=y
 CONFIG_RTC_UPDATE=y
 
-CONFIG_MISC_ENABLE_SYSTEM_RESET=n # Implemented in nPM, hence not needed in FW
-
 # Save som flash temporary
 CONFIG_APPLICATIONS_USE_QR_CODE=n
 CONFIG_APPLICATIONS_USE_X_RAY=n
\ No newline at end of file
diff --git a/app/src/main.c b/app/src/main.c
index f765f794..78acb801 100644
--- a/app/src/main.c
+++ b/app/src/main.c
@@ -140,7 +140,7 @@ static void run_input_work(struct k_work *item)
     switch (container->event.code) {
         // Button event
         case (INPUT_KEY_Y): {
-#ifdef CONFIG_MISC_ENABLE_SYSTEM_RESET
+#if(CONFIG_MISC_ENABLE_SYSTEM_RESET && (CONFIG_ZSWATCH_PCB_REV < 5))
             LOG_INF("Force restart");
 
             retained.off_count += 1;