diff --git a/CHANGELOG-EE b/CHANGELOG-EE
index 5068fa0ba64e5ea786fe6b90314e6b8bfb432dee..3143c873ab6a08a86cb8b63e3258363dae05ee11 100644
--- a/CHANGELOG-EE
+++ b/CHANGELOG-EE
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.5.0 (unreleased)
   - Show warning when mirror repository default branch could not be updated because it has diverged from upstream.
+  - More reliable wiki indexer
 
 v 8.4.2
   - Elasticsearch indexer performance improvements
diff --git a/lib/tasks/gitlab/elastic.rake b/lib/tasks/gitlab/elastic.rake
index 9c19d8a0911d686f7492297d2c730a4bee34c704..8ef2580a7b8f9d38b65b2d27ffcd1041347379c4 100644
--- a/lib/tasks/gitlab/elastic.rake
+++ b/lib/tasks/gitlab/elastic.rake
@@ -21,7 +21,19 @@ namespace :gitlab do
 
     desc "Indexing all wikis"
     task index_wikis: :environment  do
-      ProjectWiki.import
+      ProjectWiki.__elasticsearch__.create_index!
+
+      Project.where(wiki_enabled: true).find_each do |project|
+        unless project.wiki.empty?
+          puts "Indexing wiki of #{project.name_with_namespace}..."
+          begin
+            project.wiki.index_blobs
+            puts "Done!".green
+          rescue StandardError => e
+            puts "#{e.message}, trace - #{e.backtrace}"
+          end
+        end
+      end
     end
 
     desc "Create indexes in the Elasticsearch from database records"