diff --git a/opencontrail/files/3.0/contrail-api.conf b/opencontrail/files/3.0/contrail-api.conf
index dbe1b77..2191201 100644
--- a/opencontrail/files/3.0/contrail-api.conf
+++ b/opencontrail/files/3.0/contrail-api.conf
@@ -39,6 +39,9 @@
 {% if config.override_rpf_default_by is defined %}
 override_rpf_default_by={{ config.override_rpf_default_by | lower }}
 {% endif %}
+{%- if config.get('list_optimization_enabled', False) %}
+list_optimization_enabled=True
+{%- endif %}
 
 [SECURITY]
 use_certs=False
diff --git a/opencontrail/files/4.0/contrail-api.conf b/opencontrail/files/4.0/contrail-api.conf
index c14610f..efe12cc 100644
--- a/opencontrail/files/4.0/contrail-api.conf
+++ b/opencontrail/files/4.0/contrail-api.conf
@@ -35,6 +35,9 @@
 {% if config.override_rpf_default_by is defined %}
 override_rpf_default_by={{ config.override_rpf_default_by | lower }}
 {% endif %}
+{%- if config.get('list_optimization_enabled', False) %}
+list_optimization_enabled=True
+{%- endif %}
 
 # (StrOpt) default encoding to use for string resources.
 # this is optional variable. Define it if you want to override
@@ -56,4 +59,4 @@
 #introspect_ssl_enable=false
 #sandesh_keyfile=/etc/contrail/ssl/private/server-privkey.pem
 #sandesh_certfile=/etc/contrail/ssl/certs/server.pem
-#sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem
\ No newline at end of file
+#sandesh_ca_cert=/etc/contrail/ssl/certs/ca-cert.pem
diff --git a/tests/pillar/control.sls b/tests/pillar/control.sls
index 1ae5ac9..0ae7584 100644
--- a/tests/pillar/control.sls
+++ b/tests/pillar/control.sls
@@ -62,6 +62,7 @@
       id: 2
     - host: 127.0.0.1
       id: 3
+    list_optimization_enabled: true
   control:
     version: 3.0
     enabled: true
diff --git a/tests/pillar/control4_0.sls b/tests/pillar/control4_0.sls
index 4177979..907dee7 100644
--- a/tests/pillar/control4_0.sls
+++ b/tests/pillar/control4_0.sls
@@ -64,6 +64,7 @@
       id: 2
     - host: 127.0.0.1
       id: 3
+    list_optimization_enabled: true
   control:
     version: 4.0
     enabled: true