diff --git a/lib/notational-velocity-view.coffee b/lib/notational-velocity-view.coffee
index 1fdb678..036b3c9 100644
--- a/lib/notational-velocity-view.coffee
+++ b/lib/notational-velocity-view.coffee
@@ -28,6 +28,8 @@ class NotationalVelocityView extends SelectListView
       @populateList() if @documentsLoaded
     @docQuery.on "removed", (fileDetails) =>
       @populateList() if @documentsLoaded
+    if !atom.config.get('nvatom.enableLunrPipeline')
+      @docQuery.searchIndex.pipeline.reset()
 
   isCursorProceeded: ->
     editor = @filterEditorView.model
diff --git a/lib/notational-velocity.coffee b/lib/notational-velocity.coffee
index c4fb388..6620b3c 100644
--- a/lib/notational-velocity.coffee
+++ b/lib/notational-velocity.coffee
@@ -9,6 +9,11 @@ module.exports =
       description: 'The directory to archive notes'
       type: 'string'
       default: path.join(process.env.ATOM_HOME, 'nvatom-notes')
+    enableLunrPipeline:
+      title: 'Enable Lunr Pipeline'
+      description: 'Lunr pipeline preprocesses query to make search faster. However, it will skip searching some of stop words such as "an" or "be".'
+      type: 'boolean'
+      default: true
 
   notationalVelocityView: null