diff --git a/src/main/resources/cms.conf b/src/main/resources/cms.conf
index 6d0200715..8c2bf8fcd 100644
--- a/src/main/resources/cms.conf
+++ b/src/main/resources/cms.conf
@@ -84,6 +84,7 @@ hystrix.command.KmsEncrypt.execution.isolation.thread.timeoutInMilliseconds=3000
 
 # Default AWS limit was 5 as of Aug 2017
 hystrix.threadpool.KmsCreateKey.coreSize=5
+hystrix.command.KmsCreateKey.execution.isolation.thread.timeoutInMilliseconds=2000
 
 # Default AWS limit was 5 as of Aug 2017
 hystrix.threadpool.KmsCreateAlias.coreSize=5