diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c
index 895c55def..16cb0274b 100644
--- a/src/jtag/drivers/ftdi.c
+++ b/src/jtag/drivers/ftdi.c
@@ -676,19 +676,20 @@ static void ftdi_execute_stableclocks(struct jtag_command *cmd)
 static void ftdi_execute_command(struct jtag_command *cmd)
 {
 	switch (cmd->type) {
-		case JTAG_RESET:
 #if BUILD_FTDI_CJTAG == 1
-			cjtag_reset_online_activate(); /* put the target back into selected cJTAG mode */
-#endif
+		case JTAG_RESET:
+			if (cmd->cmd.reset->trst)
+				cjtag_reset_online_activate(); /* put the target (back) into selected cJTAG mode */
 			break;
+#endif
 		case JTAG_RUNTEST:
 			ftdi_execute_runtest(cmd);
 			break;
 		case JTAG_TLR_RESET:
-			ftdi_execute_statemove(cmd);
 #if BUILD_FTDI_CJTAG == 1
-			cjtag_reset_online_activate(); /* put the target back into selected cJTAG mode */
+			cjtag_reset_online_activate(); /* put the target (back) into selected cJTAG mode */
 #endif
+			ftdi_execute_statemove(cmd);
 			break;
 		case JTAG_PATHMOVE:
 			ftdi_execute_pathmove(cmd);