diff --git a/lib/mongo/grid/fs_bucket.rb b/lib/mongo/grid/fs_bucket.rb
index 9981ab9189..8a05b570e5 100644
--- a/lib/mongo/grid/fs_bucket.rb
+++ b/lib/mongo/grid/fs_bucket.rb
@@ -438,7 +438,7 @@ def files_name
       end
 
       def ensure_indexes!
-        if files_collection.find({}).count == 0
+        if files_collection.find({}, limit: -1).to_a.empty?
           chunks_collection.indexes.create_one(FSBucket::CHUNKS_INDEX, :unique => true)
           files_collection.indexes.create_one(FSBucket::FILES_INDEX)
         end