diff --git a/app/models/legacy/domain_history.rb b/app/models/legacy/domain_history.rb
index fbe292c41..ce8cebfe2 100644
--- a/app/models/legacy/domain_history.rb
+++ b/app/models/legacy/domain_history.rb
@@ -103,7 +103,8 @@ module Legacy
                 where("object->>'hostname'='#{main_attrs[:hostname]}'").
                 reorder("created_at ASC").first
               server[:id] = version.item_id.to_i
-              ::NameserverVersion.where(item_type: ::NameserverVersion, item_id: version.item_id).where(event: :create).first_or_create!(
+              search_rel = ::NameserverVersion.where(item_type: ::NameserverVersion, item_id: version.item_id)
+              search_rel.where(event: :create).first_or_create!(
                     whodunnit: user.try(:id),
                     object: nil,
                     object_changes: server.each_with_object({}){|(k,v), h| h[k] = [nil, v]},
@@ -112,7 +113,7 @@ module Legacy
               if !version.object["ipv4"].sort.eql?(main_attrs[:ipv4]) || !version.object["ipv6"].sort.eql?(main_attrs[:ipv6])
                 object_changes = {}
                 server.stringify_keys.each{|k, v| object_changes[k] = [v, version.object[k]] if v != version.object[k] }
-                to_import << version.item.versions.where(event: :update).build(
+                to_import << search_rel.where(event: :update).build(
                     whodunnit: user.try(:id),
                     object: server,
                     object_changes: object_changes,
diff --git a/lib/tasks/import_history.rake b/lib/tasks/import_history.rake
index 3f43ddac5..ce96d5538 100644
--- a/lib/tasks/import_history.rake
+++ b/lib/tasks/import_history.rake
@@ -6,7 +6,7 @@ namespace :import do
   end
 
   def parallel_import all_ids
-    thread_pool = (Parallel.processor_count rescue 4) - 1
+    thread_pool = (Parallel.processor_count rescue 4)
     threads     = []
 
     all_ids.each_with_index do |one_id, i|