diff --git a/ESPLoader.js b/ESPLoader.js
index bee8e18..fcdca0e 100644
--- a/ESPLoader.js
+++ b/ESPLoader.js
@@ -777,7 +777,10 @@ class ESPLoader {
         let image, address;
         for (var i = 0; i < fileArray.length; i++) {
             console.log("Data Length " + fileArray[i].data.length);
-            image = fileArray[i].data + '\xff\xff\xff\xff'.substring(0, 4 - fileArray[i].data.length % 4);
+
+            image = fileArray[i].data;
+            const reminder = fileArray[i].data.length % 4;
+            if (reminder > 0) image += '\xff\xff\xff\xff'.substring(4 - reminder);
             address = fileArray[i].address;
             console.log("Image Length " + image.length);
             if (image.length === 0) {
diff --git a/targets/esp32c3.js b/targets/esp32c3.js
index 2a8f26f..a1d4cc4 100644
--- a/targets/esp32c3.js
+++ b/targets/esp32c3.js
@@ -8,7 +8,7 @@ export default class ESP32C3ROM {
   static UART_DATE_REG_ADDR = 0x6000007c;
 
   static FLASH_WRITE_SIZE = 0x400;
-  static BOOTLOADER_FLASH_OFFSET = 0x1000;
+  static BOOTLOADER_FLASH_OFFSET = 0;
 
   static FLASH_SIZES = {
     "1MB": 0x00,