diff --git a/neutron/cmd/upgrade_checks/checks.py b/neutron/cmd/upgrade_checks/checks.py
index fc5913a2267..340d2346d6c 100644
--- a/neutron/cmd/upgrade_checks/checks.py
+++ b/neutron/cmd/upgrade_checks/checks.py
@@ -27,6 +27,7 @@ from sqlalchemy import or_
 
 from neutron._i18n import _
 from neutron.cmd.upgrade_checks import base
+from neutron.db.extra_dhcp_opt import models as extra_dhcp_opt_models
 from neutron.db.models import agent as agent_model
 from neutron.db.models import external_net
 from neutron.db.models import l3 as l3_models
@@ -56,6 +57,18 @@ def get_agents(agt_type):
     return query.all()
 
 
+def get_extra_dhcp_opts():
+    """Get extra DHCP options for all ports from Database
+
+    :return: list of ports' extra_dhcp_option names and values
+    """
+    ctx = context.get_admin_context()
+    query = model_query.get_collection_query(
+        ctx,
+        extra_dhcp_opt_models.ExtraDhcpOpt)
+    return query.all()
+
+
 def get_l3_agents():
     return get_agents(constants.AGENT_TYPE_L3)
 
@@ -163,6 +176,8 @@ class CoreChecks(base.BaseChecks):
             (_('Floating IP inherits the QoS policy from the external '
                'network'),
              self.floatingip_inherit_qos_from_network),
+            (_('Port extra DHCP options check'),
+             self.extra_dhcp_options_check),
         ]
 
     @staticmethod
@@ -463,3 +478,39 @@ class CoreChecks(base.BaseChecks):
             upgradecheck.Code.SUCCESS,
             _('There are no external networks with QoS policies associated '
               'and floating IPs without.'))
+
+    @staticmethod
+    def extra_dhcp_options_check(checker):
+        """Check newline char in the extra_dhcp_opts
+
+        Since LP#1939733, extra_dhcp_opts names and values shouldn't contain
+        newline characters. This check emits a warning message in case of
+        having any extra dhcp option defined with newline char in the name or
+        value.
+        """
+        if not cfg.CONF.database.connection:
+            return upgradecheck.Result(
+                upgradecheck.Code.WARNING,
+                _("Database connection string is not set. Check for "
+                  "extra_dhcp_opts can't be done."))
+
+        ports_with_invalid_options = []
+        for extra_dhcp_opt in get_extra_dhcp_opts():
+            if (len(extra_dhcp_opt.opt_name.splitlines()) > 1 or
+                    len(extra_dhcp_opt.opt_value.splitlines()) > 1):
+                ports_with_invalid_options.append(extra_dhcp_opt.port_id)
+
+        if ports_with_invalid_options:
+            return upgradecheck.Result(
+                upgradecheck.Code.WARNING,
+                _('The following ports have an extra DHCP options with '
+                  'the newline character inside: %s. '
+                  'Please update them manually in the Neutron Database, '
+                  'otherwise they will be trimmed automatically before '
+                  'used in the DHCP service') %
+                ', '.join(ports_with_invalid_options))
+
+        return upgradecheck.Result(
+            upgradecheck.Code.SUCCESS,
+            _('There are no extra_dhcp_opts with the newline character '
+              'in the option name or option value.'))
diff --git a/neutron/tests/unit/cmd/upgrade_checks/test_checks.py b/neutron/tests/unit/cmd/upgrade_checks/test_checks.py
index 1e6414d72ed..69dc4a1d9c2 100644
--- a/neutron/tests/unit/cmd/upgrade_checks/test_checks.py
+++ b/neutron/tests/unit/cmd/upgrade_checks/test_checks.py
@@ -244,3 +244,37 @@ class TestChecks(base.BaseTestCase):
                 result = checks.CoreChecks. \
                     floatingip_inherit_qos_from_network(mock.ANY)
                 self.assertEqual(returned_code, result.code)
+
+    def test_extra_dhcp_options_check_all_good(self):
+        with mock.patch.object(
+                checks, 'get_extra_dhcp_opts') as get_extra_dhcp_opts_mock:
+            get_extra_dhcp_opts_mock.return_value = [
+                mock.Mock(port_id="port-1", opt_name='foo', opt_value='bar')]
+            result = checks.CoreChecks.extra_dhcp_options_check(mock.ANY)
+            self.assertEqual(Code.SUCCESS, result.code)
+
+    def test_extra_dhcp_options_check_bad_name(self):
+        with mock.patch.object(
+                checks, 'get_extra_dhcp_opts') as get_extra_dhcp_opts_mock:
+            get_extra_dhcp_opts_mock.return_value = [
+                mock.Mock(port_id='good',
+                          opt_name='foo',
+                          opt_value='bar'),
+                mock.Mock(port_id='bad-name',
+                          opt_name='foo\nfoo',
+                          opt_value='bar')]
+            result = checks.CoreChecks.extra_dhcp_options_check(mock.ANY)
+            self.assertEqual(Code.WARNING, result.code)
+
+    def test_extra_dhcp_options_check_bad_value(self):
+        with mock.patch.object(
+                checks, 'get_extra_dhcp_opts') as get_extra_dhcp_opts_mock:
+            get_extra_dhcp_opts_mock.return_value = [
+                mock.Mock(port_id='good',
+                          opt_name='foo',
+                          opt_value='bar'),
+                mock.Mock(port_id='bad-value',
+                          opt_name='foo',
+                          opt_value='bar\nbar')]
+            result = checks.CoreChecks.extra_dhcp_options_check(mock.ANY)
+            self.assertEqual(Code.WARNING, result.code)