diff --git a/templates/ephemeral-heat/heat.conf.j2 b/templates/ephemeral-heat/heat.conf.j2
index bead52bd7..e952fea7d 100644
--- a/templates/ephemeral-heat/heat.conf.j2
+++ b/templates/ephemeral-heat/heat.conf.j2
@@ -11,7 +11,6 @@ max_json_body_size = 8388608
 max_nested_stack_depth = 10
 max_resources_per_stack=-1
 num_engine_workers = {{ num_engine_workers }}
-rpc_poll_timeout = 60
 rpc_response_timeout = 600
 transport_url={{ transport_url }}
 
diff --git a/tripleoclient/heat_launcher.py b/tripleoclient/heat_launcher.py
index f4eddf88d..6e7d2c8c4 100644
--- a/tripleoclient/heat_launcher.py
+++ b/tripleoclient/heat_launcher.py
@@ -235,7 +235,6 @@ class HeatBaseLauncher(object):
 [DEFAULT]
 log_file = %(log_file)s
 transport_url = 'fake://'
-rpc_poll_timeout = 60
 rpc_response_timeout = 600
 deferred_auth_method = password
 num_engine_workers=1