diff --git a/neutron/opts.py b/neutron/opts.py
index 02b5d0ca135..6f1d91799e1 100644
--- a/neutron/opts.py
+++ b/neutron/opts.py
@@ -181,6 +181,8 @@ def list_dhcp_agent_opts():
 
 def list_linux_bridge_opts():
     return [
+        ('DEFAULT',
+         neutron.conf.service.RPC_EXTRA_OPTS),
         ('linux_bridge',
          neutron.conf.plugins.ml2.drivers.linuxbridge.bridge_opts),
         ('vxlan',
diff --git a/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
index 009e779354f..e650a097c5d 100644
--- a/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
+++ b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
@@ -42,6 +42,7 @@ from neutron.common import config as common_config
 from neutron.common import profiler as setup_profiler
 from neutron.common import utils
 from neutron.conf.agent import common as agent_config
+from neutron.conf import service as service_conf
 from neutron.plugins.ml2.drivers.agent import _agent_manager_base as amb
 from neutron.plugins.ml2.drivers.agent import _common_agent as ca
 from neutron.plugins.ml2.drivers.agent import config as cagt_config  # noqa
@@ -1032,6 +1033,8 @@ def main():
 
     common_config.setup_logging()
     agent_config.setup_privsep()
+    service_conf.register_service_opts(service_conf.RPC_EXTRA_OPTS, cfg.CONF)
+
     try:
         interface_mappings = helpers.parse_mappings(
             cfg.CONF.LINUX_BRIDGE.physical_interface_mappings)