diff --git a/platformio.ini b/platformio.ini
index 82da3e0..482551c 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -405,6 +405,22 @@ build_flags =
 	-DARDUINO_USB_MODE=1
 	-DARDUINO_USB_CDC_ON_BOOT=1
 	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
+lib_deps =
+	${common.lib_deps}
+	adafruit/Adafruit GFX Library @ 1.11.9
+	adafruit/Adafruit SSD1306 @ 2.5.10
+
+[env:ESP32_C3_OctopusLab_LoRa]
+board = esp32-c3-devkitm-1
+board_build.mcu = esp32c3
+build_flags =
+	-Werror -Wall
+	-DESP32_C3_OctopusLab_LoRa
+	-DHAS_SX1268
+	-DRADIO_HAS_XTAL
+	-DARDUINO_USB_MODE=1
+	-DARDUINO_USB_CDC_ON_BOOT=1
+	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
 lib_deps =
 	${common.lib_deps}
 	adafruit/Adafruit GFX Library @ 1.11.9
diff --git a/src/battery_utils.cpp b/src/battery_utils.cpp
index fbd1037..834a5ec 100644
--- a/src/battery_utils.cpp
+++ b/src/battery_utils.cpp
@@ -118,7 +118,11 @@ namespace BATTERY_Utils {
                             sample = analogRead(BATTERY_PIN);
                         }
                     #else
-                        sample = analogRead(BATTERY_PIN);
+                        #ifdef BATTERY_PIN
+                            sample = analogRead(BATTERY_PIN);
+                        #else
+                            sample = 0;
+                        #endif
                     #endif
                 #endif                
                 sampleSum += sample;
diff --git a/src/boards_pinout.h b/src/boards_pinout.h
index 38590b1..352c224 100644
--- a/src/boards_pinout.h
+++ b/src/boards_pinout.h
@@ -204,6 +204,19 @@
     #define RADIO_IRQ_PIN    2
 #endif
 
+#if defined(ESP32_C3_OctopusLab_LoRa)
+    #define OLED_SDA            0
+    #define OLED_SCL            1
+    #define OLED_RST            -1
+    #define RADIO_SCLK_PIN      6
+    #define RADIO_MISO_PIN      4
+    #define RADIO_MOSI_PIN      7
+    #define RADIO_CS_PIN        5
+    #define RADIO_DIO1_PIN      3
+    #define RADIO_RST_PIN       -1
+    #define RADIO_BUSY_PIN      8
+#endif
+
 /* (Same pins for LILYGO LoRa32 and ESP32 Wroom Dev )
 SX1278-------------------> ESP32 ttgo-lora32-v21 and ESP32 WROOM Dev
 GND                         GND
diff --git a/src/lora_utils.cpp b/src/lora_utils.cpp
index e7edfcd..04a2796 100644
--- a/src/lora_utils.cpp
+++ b/src/lora_utils.cpp
@@ -43,11 +43,14 @@ namespace LoRa_Utils {
     void setup() {
         SPI.begin(RADIO_SCLK_PIN, RADIO_MISO_PIN, RADIO_MOSI_PIN);
         float freq = (float)Config.loramodule.rxFreq / 1000000;
+        #if defined(RADIO_HAS_XTAL)
+            radio.XTAL = true;
+        #endif
         int state = radio.begin(freq);
         if (state == RADIOLIB_ERR_NONE) {
             Utils::println("Initializing LoRa Module");
         } else {
-            Utils::println("Starting LoRa failed!");
+            Utils::println("Starting LoRa failed! State: " + String(state));
             while (true);
         }
         #if defined(HAS_SX1262) || defined(HAS_SX1268)