diff --git a/RNode_Firmware.ino b/RNode_Firmware.ino
index 54ddb12..22f841f 100644
--- a/RNode_Firmware.ino
+++ b/RNode_Firmware.ino
@@ -138,7 +138,11 @@ void setup() {
   #endif
 
   #if HAS_DISPLAY
+    #if HAS_EEPROM
     if (EEPROM.read(eeprom_addr(ADDR_CONF_DSET)) != CONF_OK_BYTE) {
+    #elif MCU_VARIANT == MCU_NRF52
+    if (eeprom_read(eeprom_addr(ADDR_CONF_DSET)) != CONF_OK_BYTE) {
+    #endif
       eeprom_update(eeprom_addr(ADDR_CONF_DSET), CONF_OK_BYTE);
       eeprom_update(eeprom_addr(ADDR_CONF_DINT), 0xFF);
     }
@@ -1106,6 +1110,7 @@ void validate_status() {
               }
             #else
               hw_ready = true;
+              device_init_done = true;
             #endif
           } else {
             hw_ready = false;