diff --git a/config/main.py b/config/main.py
index 709c96402a..46bfc332b0 100644
--- a/config/main.py
+++ b/config/main.py
@@ -4853,6 +4853,14 @@ def add_interface_ip(ctx, interface_name, ip_addr, gw, secondary):
         interface_name = interface_alias_to_name(config_db, interface_name)
         if interface_name is None:
             ctx.fail("'interface_name' is None!")
+        # Add a validation to check this interface is not a member in vlan before
+        # changing it to a router port mode
+    vlan_member_table = config_db.get_table('VLAN_MEMBER')
+
+    if (interface_is_in_vlan(vlan_member_table, interface_name)):
+        click.echo("Interface {} is a member of vlan\nAborting!".format(interface_name))
+        return
+
 
     portchannel_member_table = config_db.get_table('PORTCHANNEL_MEMBER')
 
diff --git a/tests/vlan_test.py b/tests/vlan_test.py
index 2d3c1dcf1b..fc3569b87d 100644
--- a/tests/vlan_test.py
+++ b/tests/vlan_test.py
@@ -1426,7 +1426,7 @@ def test_config_set_router_port_on_member_interface(self):
                                ["Ethernet4", "10.10.10.1/24"], obj=obj)
         print(result.exit_code, result.output)
         assert result.exit_code == 0
-        assert 'Interface Ethernet4 is in trunk mode and needs to be in routed mode!' in result.output
+        assert 'Interface Ethernet4 is a member of vlan\nAborting!\n' in result.output
 
     def test_config_vlan_add_member_of_portchannel(self):
         runner = CliRunner()