diff --git a/components/mch2022-bsp b/components/mch2022-bsp
index aa0214c..931b0bb 160000
--- a/components/mch2022-bsp
+++ b/components/mch2022-bsp
@@ -1 +1 @@
-Subproject commit aa0214c069b1b05a0392331c89dfa202a0fa61b1
+Subproject commit 931b0bb849668a31bd5ab29e1e7b347ba986b539
diff --git a/components/mch2022-rp2040 b/components/mch2022-rp2040
index b5b6460..a7775f4 160000
--- a/components/mch2022-rp2040
+++ b/components/mch2022-rp2040
@@ -1 +1 @@
-Subproject commit b5b64602231a80708bb016d92c67c878ec4d226d
+Subproject commit a7775f401057b64fad50476aa418eb046815f9a0
diff --git a/components/spi-ice40 b/components/spi-ice40
index 108625c..abdc7b2 160000
--- a/components/spi-ice40
+++ b/components/spi-ice40
@@ -1 +1 @@
-Subproject commit 108625c65834d6cdfef60f4725be8c53c3ad6d61
+Subproject commit abdc7b235095e5914a7f7855796ac4a0f922c53c
diff --git a/main/fpga_test.c b/main/fpga_test.c
index 6bd8e8b..d1de60d 100644
--- a/main/fpga_test.c
+++ b/main/fpga_test.c
@@ -184,6 +184,8 @@ void fpga_test(ILI9341* ili9341, ICE40* ice40, xQueueHandle buttonQueue) {
         }
         if (res != ESP_OK) {
             printf("Failed to load app bitstream into FPGA (%d)\n", res);
+            ice40_disable(ice40);
+            ili9341_init(ili9341);
             return;
         } else {
             printf("Bitstream loaded succesfully!\n");