diff --git a/src/flash.c b/src/flash.c
--- a/src/flash.c
+++ b/src/flash.c
@@ -14,8 +14,6 @@ settings_t settings;
 // Initialize flash and restore settings
 void flash_init(void)
 {
-//	settings.values.can_id = CAN_ID_DEFAULT;
-//	settings.values.tx_period = CAN_TRANSMISSION_PERIOD_DEFAULT;
 	flash_restoresettings();
 }
 
@@ -67,6 +65,11 @@ void flash_restoresettings(void)
 			settings.data[readctr] = eeprom_emulation[readctr];
 		}
 	}
+	// No data in flash! Set defaults here
+	else
+	{
+		settings.values.can_id = 22;
+	}
 }