diff --git a/polkadot/cli/src/lib.rs b/polkadot/cli/src/lib.rs
index c5b36e05c1..aa3cab1b84 100644
--- a/polkadot/cli/src/lib.rs
+++ b/polkadot/cli/src/lib.rs
@@ -158,5 +158,8 @@ fn run_until_exit<T, SC, B, CE, W>(
 	let _ = runtime.block_on(service.select(work));
 	exit_send.fire();
 
+	// TODO [andre]: timeout this future substrate/#1318
+	let _ = runtime.shutdown_on_idle().wait();
+
 	Ok(())
 }