diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index aa898c904..954287c4e 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1152,11 +1152,8 @@ void  __attribute__((noreturn)) AppMain(void) {
 	// Load the FPGA image, which we have stored in our flash.
 	// (the HF version by default)
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	// turn off antenna
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	
 	StartTickCount();
-
   	
 #ifdef WITH_LCD
 	LCDInit();
diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index e7a691811..479c11197 100644
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -406,6 +406,9 @@ void FpgaDownloadAndGo(int bitstream_version) {
 
 	inflateEnd(&compressed_fpga_stream);
 
+	// turn off antenna
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	
 	// free eventually allocated BigBuf memory
 	BigBuf_free(); BigBuf_Clear_ext(false);
 }