diff --git a/geocoder/geocoder.cpp b/geocoder/geocoder.cpp
index 9442cf99f8..7049ac7a7e 100644
--- a/geocoder/geocoder.cpp
+++ b/geocoder/geocoder.cpp
@@ -260,10 +260,11 @@ void Geocoder::Go(Context & ctx, Type type) const
       vector<Type> allTypes;
       for (size_t tokId = 0; tokId < ctx.GetNumTokens(); ++tokId)
       {
-        if (search::IsStreetSynonym(strings::MakeUniString(ctx.GetToken(tokId))))
+        auto const t = ctx.GetTokenType(tokId);
+
+        if (t == Type::Street && search::IsStreetSynonym(strings::MakeUniString(ctx.GetToken(tokId))))
           continue;
 
-        auto const t = ctx.GetTokenType(tokId);
         certainty += GetWeight(t);
         if (t != Type::Count)
           allTypes.push_back(t);