diff --git a/warc-indexer/src/main/java/uk/bl/wa/analyser/TextAnalysers.java b/warc-indexer/src/main/java/uk/bl/wa/analyser/TextAnalysers.java
index a0dc47db..e7bcfb51 100644
--- a/warc-indexer/src/main/java/uk/bl/wa/analyser/TextAnalysers.java
+++ b/warc-indexer/src/main/java/uk/bl/wa/analyser/TextAnalysers.java
@@ -64,7 +64,9 @@ public void analyse( SolrRecord solr ) {
             text = text.trim();
             if( !"".equals( text ) ) {
                 for( AbstractTextAnalyser ta : analysers ) {
-                    ta.analyse(text, solr);
+                    if (ta.isEnabled()) {
+                        ta.analyse(text, solr);
+                    }
                 }
             }
         }
diff --git a/warc-indexer/src/main/java/uk/bl/wa/analyser/text/PostcodeAnalyser.java b/warc-indexer/src/main/java/uk/bl/wa/analyser/text/PostcodeAnalyser.java
index b0be9cfc..cb923d06 100644
--- a/warc-indexer/src/main/java/uk/bl/wa/analyser/text/PostcodeAnalyser.java
+++ b/warc-indexer/src/main/java/uk/bl/wa/analyser/text/PostcodeAnalyser.java
@@ -52,8 +52,7 @@ public class PostcodeAnalyser extends AbstractTextAnalyser {
      * @param conf
      */
     public void configure(Config conf) {
-        if (!conf.hasPath("warc.index.extract.content.text_extract_postcodes")
-                || conf.getBoolean(
+        if (conf.getBoolean(
                         "warc.index.extract.content.text_extract_postcodes")) {
             setEnabled(true);
         } else {