diff --git a/src/main/java/ua/everybuy/service/integration/WakeUpService.java b/src/main/java/ua/everybuy/service/integration/WakeUpService.java
index 130c2de..371a3a6 100644
--- a/src/main/java/ua/everybuy/service/integration/WakeUpService.java
+++ b/src/main/java/ua/everybuy/service/integration/WakeUpService.java
@@ -6,23 +6,53 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.HttpStatusCodeException;
 
 @Service
 @RequiredArgsConstructor
 @Slf4j
 public class WakeUpService {
     private final ExchangeService exchangeService;
+
     @Value("${user.service.url}")
     private String userServiceUrl;
+
+    @Value("${api.gateway.url}")
+    private String apiGatewayUrl;
+
     private static final String WAKE_UP_ENDPOINT = "/keep-alive";
 
-//    @Scheduled(fixedRate = 300000)
+    @Scheduled(fixedRate = 300_000)
     public void sendEmptyRequestToWakeUpService() {
         String userServiceWakeUpUrl = userServiceUrl + WAKE_UP_ENDPOINT;
-        ResponseEntity<String> response = exchangeService
-                .exchangeGetRequest(userServiceWakeUpUrl, String.class);
+        try {
+            ResponseEntity<String> response = exchangeService
+                    .exchangeGetRequest(userServiceWakeUpUrl, String.class);
+            log.info("Send request to user service");
+            log.info(response.getBody());
+
+        } catch (HttpStatusCodeException e) {
+            log.error("User service returned {} error. Response: {}",
+                    e.getStatusCode(), e.getResponseBodyAsString());
+        } catch (Exception e) {
+            log.error("Failed to send request to user service: {}", e.getMessage());
+        }
+    }
+
+    @Scheduled(fixedRate = 300_000)
+    public void sendEmptyRequestToGatewayService() {
+        String apiGatewayServiceWakeUpUrl = apiGatewayUrl + WAKE_UP_ENDPOINT;
+        try {
+            ResponseEntity<String> response = exchangeService
+                    .exchangeGetRequest(apiGatewayServiceWakeUpUrl, String.class);
+            log.info("Send request to gateway service");
+            log.info(response.getBody());
 
-        log.info("Send request to user service");
-        log.info(response.getBody());
+        } catch (HttpStatusCodeException e) {
+            log.error("Gateway service returned {} error. Response: {}",
+                    e.getStatusCode(), e.getResponseBodyAsString());
+        } catch (Exception e) {
+            log.error("Failed to send request to gateway service: {}", e.getMessage());
+        }
     }
 }
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 132e807..01d5888 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -25,6 +25,7 @@ spring.flyway.locations=classpath:db/migration
 auth.service.url =https://service-authorization-b1jx.onrender.com/auth/validate
 user.service.url =https://service-user-qxpc.onrender.com/user
 chat.service.url =https://service-chat-t47s.onrender.com/chat
+api.gateway.url =https://api-everybuy.onrender.com/
 
 service.password.value=${SERVICE_PASSWORD:111}
 
@@ -37,5 +38,3 @@ spring.cache.type=redis
 spring.data.redis.host=localhost
 spring.data.redis.port=6379
 #spring.cache.redis.time-to-live=6000000
-
-spring.data.elasticsearch.client.reactive.endpoints=localhost:9200
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 4f66821..a548dfb 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -17,10 +17,11 @@ spring.flyway.enabled=true
 spring.flyway.baseline-on-migrate=true
 spring.flyway.locations=classpath:db/migration
 
-#Internal microservices
+# Internal microservices
 auth.service.url=${AUTH_URL}
 user.service.url=${USER_URL}
 chat.service.url=${CHAT_URL}
+api.gateway.url=${GATEWAY_URL}
 
 service.password.value=${SERVICE_PASSWORD}