diff --git a/ESP32_AP-Flasher/data/languages.json b/ESP32_AP-Flasher/data/languages.json
index fa7577e98..2de8dbabd 100644
--- a/ESP32_AP-Flasher/data/languages.json
+++ b/ESP32_AP-Flasher/data/languages.json
@@ -74,6 +74,13 @@
     "daysShort": [ "SØ", "MA", "TI", "ON", "TO", "FR", "LØ" ],
     "days": [ "Søndag", "Mandag", "Tirsdag", "Onsdag", "Torsdag", "Fredag", "Lørdag" ],
     "months": [ "Januar", "Februar", "Marts", "April", "Maj", "Juni", "Juli", "August", "September", "Oktober", "November", "December" ],
-    "date_format": [ "%d-%m-%Y", "%d-%m" ]  
+    "date_format": [ "%d-%m-%Y", "%d-%m" ]
+  },
+  "11": {
+    "language": "et",
+    "daysShort": [ "P", "E", "T", "K", "N", "R", "L" ],
+    "days": [ "Pühapäev", "Esmaspäev", "Teisipäev", "Kolmapäev", "Neljapäev", "Reede", "Laupäev" ],
+    "months": [ "Jaanuar", "Veebruar", "Märts", "Aprill", "Mai", "Juuni", "Juuli", "August", "September", "Oktoober", "November", "Detsember" ],
+    "date_format": [ "%d-%m-%Y", "%d-%m" ]
   }
 }
diff --git a/ESP32_AP-Flasher/data/www/index.html.gz b/ESP32_AP-Flasher/data/www/index.html.gz
index 97b5cff86..7eae74ad7 100644
Binary files a/ESP32_AP-Flasher/data/www/index.html.gz and b/ESP32_AP-Flasher/data/www/index.html.gz differ
diff --git a/ESP32_AP-Flasher/src/language.cpp b/ESP32_AP-Flasher/src/language.cpp
index e59e81cee..5a73bc9ff 100644
--- a/ESP32_AP-Flasher/src/language.cpp
+++ b/ESP32_AP-Flasher/src/language.cpp
@@ -17,7 +17,7 @@ int currentLanguage = 0;
 
 void updateLanguageFromConfig() {
     int tempLang = config.language;
-    if (tempLang < 0 || tempLang > 10) {
+    if (tempLang < 0 || tempLang > 11) {
         Serial.println("Language not supported");
         return;
     }
diff --git a/ESP32_AP-Flasher/wwwroot/index.html b/ESP32_AP-Flasher/wwwroot/index.html
index 2a72504f6..6acbb1556 100644
--- a/ESP32_AP-Flasher/wwwroot/index.html
+++ b/ESP32_AP-Flasher/wwwroot/index.html
@@ -332,6 +332,7 @@ <h3>Access Point config</h3>
 						<option value="8">ES Español</option>
 						<option value="9">SV Svenska</option>
 						<option value="10">DK Dansk</option>
+						<option value="11">ET Eesti</option>
 					</select>
 				</p>
 				<p title="Depending on the content, a tag can sleep for