diff --git a/src/main/java/ru/soune/nocopy/service/dockview/DockViewService.java b/src/main/java/ru/soune/nocopy/service/dockview/DockViewService.java
index 2810f9e..f5cdb0c 100644
--- a/src/main/java/ru/soune/nocopy/service/dockview/DockViewService.java
+++ b/src/main/java/ru/soune/nocopy/service/dockview/DockViewService.java
@@ -159,21 +159,14 @@ public class DockViewService {
         List<DockViewResponse> history = new ArrayList<>();
 
         for (DockView dockView: dockViews) {
-            String country = geoCountryService.getCountryByIp(dockView.getViewerIp(), locale);
-            String city = geoCountryService.getCityByIp(dockView.getViewerIp(), locale);
+            String country = locale.equals("en") ? dockView.getGeoNameEn(): dockView.getGeoNameRu();
             LocalDateTime createdAt = dockView.getCreatedAt();
-            String fileId = dockView.getFileId();
-
-            FileEntity file = fileEntityRepository.findByFileId(fileId);
-            Long viewerId = dockView.getViewerId();
-            User viewer =  userRepository.findById(viewerId).orElse(null);
 
             DockViewResponse response = DockViewResponse.builder()
-                    .city(city)
                     .country(country)
                     .viewDate(createdAt)
-                    .document(file.getOriginalFileName())
-                    .viewer(viewer == null ? "guest" : viewer.getFullName())
+                    .document(dockView.getDocName())
+                    .viewer(dockView.getViewerName())
                     .build();
 
             history.add(response);