diff --git a/hw/application_fpga/fw/tk1/main.c b/hw/application_fpga/fw/tk1/main.c
index b6f59ec9..3b745a58 100644
--- a/hw/application_fpga/fw/tk1/main.c
+++ b/hw/application_fpga/fw/tk1/main.c
@@ -342,9 +342,6 @@ static void run(const struct context *ctx)
 #endif
 	// clang-format on
 
-	// Flip over to application mode
-	*switch_app = 1;
-
 	// XXX Firmware stack now no longer available
 	// Don't use any function calls!
 
@@ -399,6 +396,9 @@ int main(void)
 	uint8_t cmd[CMDLEN_MAXBYTES] = {0};
 	enum state state = FW_STATE_INITIAL;
 
+	// Enable FW mode.
+	*switch_app = 0;
+
 	print_hw_version();
 
 	// Let the app know the function adddress for blake2s()