diff --git a/port/espressif/esp/src/hal/spi.zig b/port/espressif/esp/src/hal/spi.zig
index d73020b9b..e62aa9f6b 100644
--- a/port/espressif/esp/src/hal/spi.zig
+++ b/port/espressif/esp/src/hal/spi.zig
@@ -224,7 +224,7 @@ pub const SPI = enum(u2) {
         }
 
         if (pins.clk) |clk_pin| {
-            clk_pin.connect_peripheral_to_output(.{ .signal = .spiclk });
+            clk_pin.connect_peripheral_to_output(.{ .signal = .fspiclk });
         }
     }
 
@@ -379,6 +379,11 @@ pub const SPI = enum(u2) {
                 word = 0;
             }
         }
+
+        // Add remaining bytes
+        if (len % 4 != 0) {
+            fifo[len / 4] = word;
+        }
     }
 
     fn read_fifo(self: SPI, iter: *SliceVector([]u8).Iterator, len: usize) void {