diff --git a/files/scripts/swss.sh b/files/scripts/swss.sh
index 728f36f4bb6c..b331e422d50d 100755
--- a/files/scripts/swss.sh
+++ b/files/scripts/swss.sh
@@ -292,6 +292,7 @@ start() {
     # Don't flush DB during warm boot
     if [[ x"$WARM_BOOT" != x"true" ]]; then
         debug "Flushing APP, ASIC, COUNTER, CONFIG, and partial STATE databases ..."
+        clean_up_tables APPL_DB "'PORT_TABLE:Ethernet*'"
         $SONIC_DB_CLI APPL_DB FLUSHDB
         $SONIC_DB_CLI ASIC_DB FLUSHDB
         $SONIC_DB_CLI COUNTERS_DB FLUSHDB