diff --git a/integration_tests/integration_tests.pro b/integration_tests/integration_tests.pro
index 7799b5b157..fa41b46f7f 100644
--- a/integration_tests/integration_tests.pro
+++ b/integration_tests/integration_tests.pro
@@ -13,7 +13,7 @@ TEMPLATE = app
 ROOT_DIR = ..
 DEPENDENCIES = map routing search storage indexer platform geometry coding base osrm jansson protobuf tomcrypt succinct stats_client zlib
 
-macx-*: LIBS *= "-framework Foundation" "-framework IOKit"
+macx-*: LIBS *= "-framework Foundation" "-framework IOKit" "-framework SystemConfiguration"
 
 include($$ROOT_DIR/common.pri)
 
diff --git a/map/map_tests/map_tests.pro b/map/map_tests/map_tests.pro
index 2f623ee6d6..973c626a7c 100644
--- a/map/map_tests/map_tests.pro
+++ b/map/map_tests/map_tests.pro
@@ -29,7 +29,7 @@ win32* {
   LIBS *= -lShell32 -lOpengl32
   win32-g++: LIBS *= -lpthread
 }
-macx-*: LIBS *= "-framework Foundation" "-framework IOKit"
+macx-*: LIBS *= "-framework Foundation" "-framework IOKit" "-framework SystemConfiguration"
 
 SOURCES += \
   ../../testing/testingmain.cpp \
diff --git a/map_server/map_server.pro b/map_server/map_server.pro
index a6947d52be..a040e8edb2 100644
--- a/map_server/map_server.pro
+++ b/map_server/map_server.pro
@@ -25,7 +25,7 @@ INCLUDEPATH *= $$ROOT_DIR/3party/gflags/src
 
 macx* {
   LIBS *= "-framework Foundation" "-framework CoreWLAN" \
-          "-framework QuartzCore" "-framework IOKit"
+          "-framework QuartzCore" "-framework IOKit"  "-framework SystemConfiguration"
 }
 win32* : LIBS *= -lshell32
 
diff --git a/qt/qt.pro b/qt/qt.pro
index 8c9b1b42f3..30b5c26760 100644
--- a/qt/qt.pro
+++ b/qt/qt.pro
@@ -42,7 +42,7 @@ linux* {
 
 macx-* {
   LIBS *= "-framework CoreLocation" "-framework Foundation" "-framework CoreWLAN" \
-          "-framework QuartzCore" "-framework IOKit"
+          "-framework QuartzCore" "-framework IOKit" "-framework SystemConfiguration"
 
   ICON = res/mac.icns
   PLIST_FILE = Info.plist
diff --git a/routing/online_absent_fetcher.cpp b/routing/online_absent_fetcher.cpp
index de9e42e030..77496f5bfa 100644
--- a/routing/online_absent_fetcher.cpp
+++ b/routing/online_absent_fetcher.cpp
@@ -3,6 +3,7 @@
 #include "defines.hpp"
 #include "online_cross_fetcher.hpp"
 
+#include "platform/platform.hpp"
 #include "platform/country_file.hpp"
 #include "platform/local_country_file.hpp"
 
@@ -17,7 +18,8 @@ void OnlineAbsentCountriesFetcher::GenerateRequest(const m2::PointD & startPoint
                                                    const m2::PointD & finalPoint)
 {
   // Single mwm case.
-  if (m_countryFileFn(startPoint) == m_countryFileFn(finalPoint))
+  if (m_countryFileFn(startPoint) == m_countryFileFn(finalPoint) ||
+      GetPlatform().ConnectionStatus() == Platform::EConnectionType::CONNECTION_NONE)
     return;
   unique_ptr<OnlineCrossFetcher> fetcher =
       make_unique<OnlineCrossFetcher>(OSRM_ONLINE_SERVER_URL, MercatorBounds::ToLatLon(startPoint),
diff --git a/routing/routing_tests/routing_tests.pro b/routing/routing_tests/routing_tests.pro
index 8d90e68c39..173fa52ae8 100644
--- a/routing/routing_tests/routing_tests.pro
+++ b/routing/routing_tests/routing_tests.pro
@@ -8,7 +8,7 @@ TEMPLATE = app
 ROOT_DIR = ../..
 DEPENDENCIES = routing indexer platform geometry coding base osrm protobuf tomcrypt succinct jansson stats_client map
 
-macx-*: LIBS *= "-framework Foundation" "-framework IOKit"
+macx-*: LIBS *= "-framework Foundation" "-framework IOKit" "-framework SystemConfiguration"
 
 include($$ROOT_DIR/common.pri)