diff --git a/puppet/services/neutron-ovs-agent.yaml b/puppet/services/neutron-ovs-agent.yaml
index b7d225f101..3040a8fc21 100644
--- a/puppet/services/neutron-ovs-agent.yaml
+++ b/puppet/services/neutron-ovs-agent.yaml
@@ -83,6 +83,13 @@ parameters:
     description: |
       Enable OVS Hardware Offload. This feature supported from OVS 2.8.0
     type: boolean
+  OvsDisableEMC:
+    default: false
+    description: |
+      Disable OVS Exact Match Cache.
+    type: boolean
+    tags:
+      - role_specific
   NeutronOVSTunnelCsum:
     default: false
     description: |
@@ -124,10 +131,12 @@ resources:
           - map_replace:
             - neutron::agents::ml2::ovs::bridge_mappings: NeutronBridgeMappings
               vswitch::ovs::enable_hw_offload: OvsHwOffload
+              vswitch::ovs::disable_emc: OvsDisableEMC
             - values: {get_param: [RoleParameters]}
           - values:
               NeutronBridgeMappings: {get_param: NeutronBridgeMappings}
               OvsHwOffload: {get_param: OvsHwOffload}
+              OvsDisableEMC: {get_param: OvsDisableEMC}
 
 outputs:
   role_data:
diff --git a/puppet/services/openvswitch.yaml b/puppet/services/openvswitch.yaml
index 710eaede9a..a82763b579 100644
--- a/puppet/services/openvswitch.yaml
+++ b/puppet/services/openvswitch.yaml
@@ -83,6 +83,13 @@ parameters:
     default: ""
     tags:
       - role_specific
+  OvsDisableEMC:
+    default: false
+    description: |
+      Disable OVS Exact Match Cache.
+    type: boolean
+    tags:
+      - role_specific
   # DEPRECATED: the following options are deprecated and are currently maintained
   # for backwards compatibility. They will be removed in the Queens cycle.
   HostCpusList:
@@ -142,6 +149,7 @@ outputs:
               vswitch::dpdk::pmd_core_list: OvsPmdCoreList
               vswitch::dpdk::memory_channels: OvsDpdkMemoryChannels
               vswitch::dpdk::socket_mem: OvsDpdkSocketMemory
+              vswitch::dpdk::disable_emc: OvsDisableEMC
             - values: {get_param: [RoleParameters]}
           - values:
               OvsDpdkCoreList: {if: [l_cores_empty, {get_param: HostCpusList}, {get_param: OvsDpdkCoreList}]}
@@ -149,6 +157,7 @@ outputs:
               OvsDpdkSocketMemory: {if: [socket_mem_empty, {get_param: NeutronDpdkSocketMemory}, {get_param: OvsDpdkSocketMemory}]}
               OvsDpdkDriverType: {if: [driver_not_set, {get_param: NeutronDpdkDriverType}, {get_param: OvsDpdkDriverType}]}
               OvsPmdCoreList: {if: [pmd_cores_empty, {get_param: NeutronDpdkCoreList}, {get_param: OvsPmdCoreList}]}
+              OvsDisableEMC: {get_param: OvsDisableEMC}
 
       upgrade_tasks:
         - name: Check openvswitch version.
diff --git a/releasenotes/notes/OvsDisableEMC-ab29e5c08856d439.yaml b/releasenotes/notes/OvsDisableEMC-ab29e5c08856d439.yaml
new file mode 100644
index 0000000000..738a61fc0b
--- /dev/null
+++ b/releasenotes/notes/OvsDisableEMC-ab29e5c08856d439.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Added the configuration option to disable Exact Match Cache (EMC)