diff --git a/core/src/main/scala/org/apache/spark/deploy/client/AppClient.scala b/core/src/main/scala/org/apache/spark/deploy/client/AppClient.scala
index 773ffdb778e03..8d3d3024f6efc 100644
--- a/core/src/main/scala/org/apache/spark/deploy/client/AppClient.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/client/AppClient.scala
@@ -195,8 +195,7 @@ private[spark] class AppClient(
       try {
         val timeout = RpcUtils.askTimeout(conf)
         val future = actor.ask(StopAppClient)(timeout.duration)
-        // TODO(bryanc) - RpcTimeout use awaitResult ???
-        Await.result(future, timeout.duration)
+        timeout.awaitResult(future)
       } catch {
         case e: TimeoutException =>
           logInfo("Stop request to Master timed out; it may already be shut down.")