diff --git a/ampel-firmware/ampel-firmware.ino b/ampel-firmware/ampel-firmware.ino
index d45326baed5b769cba0bbdd5d820447d349bb192..7734e620a80eeed1ed9a32921c494e37603d1df8 100644
--- a/ampel-firmware/ampel-firmware.ino
+++ b/ampel-firmware/ampel-firmware.ino
@@ -171,7 +171,6 @@ void loop() {
 
   if (sensor::processData()) {
     if (config::csv_active()) {
-      //TODO: Check if not in AP mode. Lines get written with 1970 otherwise.
       csv_writer::logIfTimeHasCome(sensor::timestamp, sensor::co2, sensor::temperature, sensor::humidity);
     }
 
diff --git a/ampel-firmware/src/lib/NTPClient/NTPClient.h b/ampel-firmware/src/lib/NTPClient/NTPClient.h
index f4eb2994c3221a8bfe7460683598a774d5950a7c..5df9e7a70acf2947e4a5be2da5cc497850daaa09 100755
--- a/ampel-firmware/src/lib/NTPClient/NTPClient.h
+++ b/ampel-firmware/src/lib/NTPClient/NTPClient.h
@@ -20,7 +20,7 @@ class NTPClient {
 
     unsigned long _updateInterval = 60000;  // In ms
 
-    unsigned long _currentEpoc    = 0;      // In s
+    unsigned long _currentEpoc    = 1640995200; // NOTE: Custom code for ampel-firmware : Default is 1st January 2020. Better than 1970
     unsigned long _lastUpdate     = 0;      // In ms
 
     byte          _packetBuffer[NTP_PACKET_SIZE];
diff --git a/ampel-firmware/web_config.cpp b/ampel-firmware/web_config.cpp
index d165a1351c279ca5764d7facb4e811cc6d06d7be..51aa30d75ffc0d333f6e400ab1f743e10aab5ee7 100644
--- a/ampel-firmware/web_config.cpp
+++ b/ampel-firmware/web_config.cpp
@@ -127,7 +127,6 @@ namespace web_config {
    * NTP Time
    */
 
-  //NOTE: Save time after first NTP connection, so that time doesn't go back to 1970?
   ParameterGroup timeParams = ParameterGroup("NTP", "Time server");
   TextTParameter<STRING_LEN> ntpServerParam =
       Builder<TextTParameter<STRING_LEN>>("ntp_server").label("NTP Server").defaultValue(NTP_SERVER).build();