diff --git a/kuryr_libnetwork/port_driver/driver.py b/kuryr_libnetwork/port_driver/driver.py
index 3ef039d8..1857770c 100644
--- a/kuryr_libnetwork/port_driver/driver.py
+++ b/kuryr_libnetwork/port_driver/driver.py
@@ -133,9 +133,10 @@ class Driver(object):
             updated_port = {
                 'name': port['name'],
                 'device_owner': lib_const.DEVICE_OWNER,
-                'device_id': endpoint_id,
                 'binding:host_id': lib_utils.get_hostname(),
             }
+            if not port.get('device_id'):
+                updated_port['device_id'] = endpoint_id
             if interface_mac:
                 updated_port['mac_address'] = interface_mac
             response_port = app.neutron.update_port(port['id'],
diff --git a/kuryr_libnetwork/tests/unit/port_driver/drivers/test_veth.py b/kuryr_libnetwork/tests/unit/port_driver/drivers/test_veth.py
index f2ffd160..6eb60e1b 100644
--- a/kuryr_libnetwork/tests/unit/port_driver/drivers/test_veth.py
+++ b/kuryr_libnetwork/tests/unit/port_driver/drivers/test_veth.py
@@ -110,7 +110,6 @@ class TestVethDriver(base.TestKuryrBase):
             'port': {
                 'name': fake_port_name,
                 'device_owner': lib_const.DEVICE_OWNER,
-                'device_id': fake_endpoint_id,
                 'binding:host_id': lib_utils.get_hostname(),
                 'mac_address': fake_mac_address2
             }
@@ -143,9 +142,46 @@ class TestVethDriver(base.TestKuryrBase):
             'port': {
                 'name': fake_port_name,
                 'device_owner': lib_const.DEVICE_OWNER,
-                'device_id': fake_endpoint_id,
                 'binding:host_id': lib_utils.get_hostname()
             }
         }
         mock_update_port.assert_called_with(fake_neutron_port_id,
                                             expected_update_port)
+
+    @mock.patch('kuryr_libnetwork.app.neutron.update_port')
+    @mock.patch.object(libnet_utils, 'get_neutron_port_name')
+    def test_update_port_with_device_id(self, mock_get_port_name,
+                                        mock_update_port):
+        fake_endpoint_id = lib_utils.get_hash()
+        fake_neutron_port_id = uuidutils.generate_uuid()
+        fake_neutron_net_id = uuidutils.generate_uuid()
+        fake_neutron_v4_subnet_id = uuidutils.generate_uuid()
+        fake_neutron_v6_subnet_id = uuidutils.generate_uuid()
+        fake_mac_address1 = 'fa:16:3e:20:57:c3'
+        fake_mac_address2 = 'fa:16:3e:20:57:c4'
+        fake_neutron_port = self._get_fake_port(
+            fake_endpoint_id, fake_neutron_net_id,
+            fake_neutron_port_id, lib_const.PORT_STATUS_ACTIVE,
+            fake_neutron_v4_subnet_id, fake_neutron_v6_subnet_id,
+            '192.168.1.3', 'fe80::f816:3eff:fe1c:36a9',
+            fake_mac_address1)['port']
+        fake_neutron_port.pop('device_id')
+        fake_port_name = '-'.join([fake_endpoint_id, lib_utils.PORT_POSTFIX])
+        mock_get_port_name.return_value = fake_port_name
+
+        veth_driver = veth.VethDriver()
+        veth_driver.update_port(fake_neutron_port, fake_endpoint_id,
+                                fake_mac_address2)
+
+        mock_get_port_name.assert_called_with(fake_endpoint_id)
+        expected_update_port = {
+            'port': {
+                'name': fake_port_name,
+                'device_owner': lib_const.DEVICE_OWNER,
+                'binding:host_id': lib_utils.get_hostname(),
+                'device_id': fake_endpoint_id,
+                'mac_address': fake_mac_address2
+            }
+        }
+        mock_update_port.assert_called_with(fake_neutron_port_id,
+                                            expected_update_port)
diff --git a/kuryr_libnetwork/tests/unit/port_driver/drivers/test_vlan.py b/kuryr_libnetwork/tests/unit/port_driver/drivers/test_vlan.py
index a088b824..eafe03db 100644
--- a/kuryr_libnetwork/tests/unit/port_driver/drivers/test_vlan.py
+++ b/kuryr_libnetwork/tests/unit/port_driver/drivers/test_vlan.py
@@ -299,7 +299,6 @@ class TestVlanDriver(base.TestKuryrBase):
                 {'port': {
                     'name': fake_port_name,
                     'device_owner': lib_const.DEVICE_OWNER,
-                    'device_id': fake_endpoint_id,
                     'binding:host_id': lib_utils.get_hostname(),
                     'mac_address': fake_neutron_mac_address2
                 }})