diff --git a/src/openocd.c b/src/openocd.c
index 2c9466624..b4571b464 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -364,8 +364,8 @@ int openocd_main(int argc, char *argv[])
 	help_del_all_commands(cmd_ctx);
 
 	/* free all DAP and CTI objects */
-	dap_cleanup_all();
 	arm_cti_cleanup_all();
+	dap_cleanup_all();
 
 	adapter_quit();