diff --git a/app/controllers/admin/domain_versions_controller.rb b/app/controllers/admin/domain_versions_controller.rb
index 44a2087cd..9f8823d58 100644
--- a/app/controllers/admin/domain_versions_controller.rb
+++ b/app/controllers/admin/domain_versions_controller.rb
@@ -1,18 +1,8 @@
 class Admin::DomainVersionsController < AdminController
   load_and_authorize_resource
 
-  # rubocop:disable Style/GuardClause
   def index
-    @domain = Domain.where(id: params[:domain_id]).includes({versions: :item}).first
+    @domain = Domain.where(id: params[:domain_id]).includes(versions: :item).first
     @versions = @domain.versions
-
-    # Depricated it had to load legal document. We may do it by parsing and adding link.
-    # if @domain.pending_json.present?
-    #   frame = Nokogiri::XML(@domain.pending_json['frame'])
-    #   @pending_user  = User.find(@domain.pending_json['current_user_id'])
-    #   @pending_domain = Epp::Domain.find(@domain.id)
-    #   @pending_domain.update(frame, @pending_user, false)
-    # end
   end
-  # rubocop:enable Style/GuardClause
 end
diff --git a/app/views/admin/domain_versions/_version.haml b/app/views/admin/domain_versions/_version.haml
index 321e9abda..53d97059e 100644
--- a/app/views/admin/domain_versions/_version.haml
+++ b/app/views/admin/domain_versions/_version.haml
@@ -5,20 +5,21 @@
 
 - if domain.present?
   - if version # normal history
-    - children = HashWithIndifferentAccess.new(version.children)
-    - nameservers    = Nameserver.where(id: children[:nameservers])
-    - tech_contacts  = Contact.where(id: children[:tech_contacts])
-    - admin_contacts = Contact.where(id: children[:admin_contacts])
-    - registrant     = Contact.where(id: children[:registrant])
-    - event       = version.event
-    - creator     = plain_username(version.terminator)
+    - children       = HashWithIndifferentAccess.new(version.children)
+    - nameservers    = NameserverVersion.where(item_id: children[:nameservers]).order(:item_id).preceding(version.created_at + 1, true).select("distinct on (item_id) #{NameserverVersion.table_name}.*").map{|ver| o=Nameserver.new(ver.object); ver.object_changes.to_h.each{|k,v| o[k]=v[-1] };o }
+    -#- nameservers    = children[:nameservers].map{|id| Nameserver.new(id: id).safe_version_at(version.created_at)}
+    - tech_contacts  = Contact.where(id: children[:tech_contacts]).map{|o| o.safe_version_at(version.created_at)}
+    - admin_contacts = Contact.where(id: children[:admin_contacts]).map{|o| o.safe_version_at(version.created_at)}
+    - registrant     = Contact.where(id: children[:registrant]).map{|o| o.safe_version_at(version.created_at)}
+    - event          = version.event
+    - creator        = plain_username(version.terminator)
   - else # pending history
     - nameservers    = domain.nameservers
     - tech_contacts  = domain.tech_contacts
     - admin_contacts = domain.admin_contacts
-    - registrant  = [domain.registrant]
-    - creator     = pending_user.try(:username)
-    - event       = 'pending'
+    - registrant     = [domain.registrant]
+    - creator        = pending_user.try(:username)
+    - event         = 'pending'
 
   %td
     %p.nowrap
@@ -55,43 +56,40 @@
       = "#{l(domain.valid_to, format: :date)}"
 
   %td
-    - if registrant
-      - registrant.each do |r|
-        %p
-          = r[:name]
-          = r[:phone]
-          = r[:email]
-        %p
-          = r[:code]
+    - Array(registrant).each do |r|
+      %p
+        = r[:name]
+        = r[:phone]
+        = r[:email]
+      %p
+        = r[:code]
 
   %td
-    - if admin_contacts
-      - admin_contacts.each do |ac|
-        %p
-          = ac[:name]
-          = ac[:phone]
-          = ac[:email]
-        %p
-          = ac[:code]
+    - Array(admin_contacts).each do |ac|
+      %p
+        = ac[:name]
+        = ac[:phone]
+        = ac[:email]
+      %p
+        = ac[:code]
 
   %td
-    - if tech_contacts
-      - tech_contacts.each do |tc|
-        %p
-          = tc[:name]
-          = tc[:phone]
-          = tc[:email]
-        %p
-          = tc[:code]
+    - Array(tech_contacts).each do |tc|
+      %p
+        = tc[:name]
+        = tc[:phone]
+        = tc[:email]
+      %p
+        = tc[:code]
 
   %td
     %p
-      - if nameservers
-        - nameservers.each do |ns|
-          = ns[:hostname]
-          %br
-          = ns[:ipv4]
-          = ns[:ipv6]
+      - Array(nameservers).each do |ns|
+        = ns[:hostname]
+        %br
+        = ns[:ipv4]
+        = ns[:ipv6]
+        %br
 
   %td
     %p