diff --git a/indexer/road_shields_parser.cpp b/indexer/road_shields_parser.cpp
index 50fe93fc28..73c1d3657f 100644
--- a/indexer/road_shields_parser.cpp
+++ b/indexer/road_shields_parser.cpp
@@ -79,6 +79,13 @@ public:
 
   RoadShieldType FindNetworkShield(std::string network) const
   {
+    // Special processing for US state highways, to not duplicate the table.
+    if (network.size() == 5 && strings::StartsWith(network, "US:"))
+    {
+      if (std::find(kStatesCode.begin(), kStatesCode.end(), network.substr(3)) != kStatesCode.end())
+        return RoadShieldType::Generic_White;
+    }
+
     // Minimum length for the network tag is 4 (US:I).
     if (network.size() > 4)
     {