diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 64768922..507cc6ae 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1408,6 +1408,9 @@ void  __attribute__((noreturn)) AppMain(void)
 	// Reset SSC
 	AT91C_BASE_SSC->SSC_CR = AT91C_SSC_SWRST;
 
+	// Configure MUX
+	SetAdcMuxFor(0);
+
 	// Load the FPGA image, which we have stored in our flash.
 	// (the HF version by default)
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index c0b04f3c..faaa7983 100644
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -558,7 +558,8 @@ void SetAdcMuxFor(uint32_t whichGpio)
 	LOW(GPIO_MUXSEL_LORAW);
 	LOW(GPIO_MUXSEL_LOPKD);
 
-	HIGH(whichGpio);
+	if (whichGpio > 0)
+		HIGH(whichGpio);
 }
 
 void Fpga_print_status(void) {