diff --git a/lib/SvelteUi/app/src/lib/BoardTypeSelectOptions.svelte b/lib/SvelteUi/app/src/lib/BoardTypeSelectOptions.svelte
index d0d51c39..6fefe749 100644
--- a/lib/SvelteUi/app/src/lib/BoardTypeSelectOptions.svelte
+++ b/lib/SvelteUi/app/src/lib/BoardTypeSelectOptions.svelte
@@ -41,6 +41,12 @@
         <option value={50}>{boardtype(chip, 50)}</option>
     </optgroup>
 {/if}
+{#if chip == 'esp32c3'}
+    <optgroup label="Generic hardware">
+        <option value={71}>{boardtype(chip, 71)}</option>
+        <option value={70}>{boardtype(chip, 70)}</option>
+    </optgroup>
+{/if}
 {#if chip == 'esp32solo'}
     <optgroup label="Generic hardware">
         <option value={200}>{boardtype(chip, 200)}</option>
diff --git a/lib/SvelteUi/app/src/lib/Helpers.js b/lib/SvelteUi/app/src/lib/Helpers.js
index f8abe835..bf950af5 100644
--- a/lib/SvelteUi/app/src/lib/Helpers.js
+++ b/lib/SvelteUi/app/src/lib/Helpers.js
@@ -95,6 +95,10 @@ export function boardtype(c, b) {
             return "Wemos D1 mini";
         case 100:
             return "Generic ESP8266";
+        case 70:
+            return "Generic ESP32-C3";
+        case 71:
+            return "ESP32-C3-DevKitM-1";
     }
 }
 
diff --git a/lib/SvelteUi/src/AmsWebServer.cpp b/lib/SvelteUi/src/AmsWebServer.cpp
index 097336a0..7fe9059c 100644
--- a/lib/SvelteUi/src/AmsWebServer.cpp
+++ b/lib/SvelteUi/src/AmsWebServer.cpp
@@ -976,6 +976,15 @@ void AmsWebServer::handleSave() {
 					success = false;
 			}
 		#elif defined(CONFIG_IDF_TARGET_ESP32C3)
+			switch(boardType) {
+				case 71: // ESP32-C3-DevKitM-1
+					gpioConfig->apPin = 9;
+				case 70: // Generic ESP32-C3
+					gpioConfig->hanPin = hanPin > 0 ? hanPin : 7;
+					break;
+				default:
+					success = false;
+			}
 		#elif defined(ESP32)
 			switch(boardType) {
 				case 201: // D32
@@ -1105,6 +1114,8 @@ void AmsWebServer::handleSave() {
 			case 2: // spenceme
 			case 50: // Generic ESP32-S2
 			case 51: // Wemos S2 mini
+			case 70: // Generic ESP32-C3
+			case 71: // ESP32-C3-DevKitM-1
 				meterConfig->baud = 2400;
 				wifi.sleep = 1; // Modem sleep
 				break;