diff --git a/mappings/document.js b/mappings/document.js
index da22b396..38e8b9d4 100644
--- a/mappings/document.js
+++ b/mappings/document.js
@@ -182,7 +182,8 @@ var schema = {
         type: 'text',
         analyzer: 'peliasIndexOneEdgeGram',
         search_analyzer: 'peliasQuery',
-        similarity: 'peliasDefaultSimilarity'
+        similarity: 'peliasDefaultSimilarity',
+        norms: false
       }
     },
   },{
@@ -203,7 +204,8 @@ var schema = {
       mapping: {
         type: 'keyword',
         index: false,
-        doc_values: false
+        doc_values: false,
+        norms: false
       }
     }
   }],
diff --git a/mappings/partial/admin.json b/mappings/partial/admin.json
index 5aef0094..7cd43480 100644
--- a/mappings/partial/admin.json
+++ b/mappings/partial/admin.json
@@ -9,7 +9,8 @@
       "analyzer": "peliasIndexOneEdgeGram",
       "search_analyzer": "peliasAdmin",
       "similarity": "peliasDefaultSimilarity",
-      "doc_values": false
+      "doc_values": false,
+      "norms": false
     }
   }
 }
diff --git a/mappings/partial/countryAbbreviation.json b/mappings/partial/countryAbbreviation.json
index 67b605f1..84326a1b 100644
--- a/mappings/partial/countryAbbreviation.json
+++ b/mappings/partial/countryAbbreviation.json
@@ -9,7 +9,8 @@
       "analyzer": "peliasIndexCountryAbbreviationOneEdgeGram",
       "search_analyzer": "peliasQuery",
       "similarity": "peliasDefaultSimilarity",
-      "doc_values": false
+      "doc_values": false,
+      "norms": false
     }
   }
 }
diff --git a/mappings/partial/postalcode.json b/mappings/partial/postalcode.json
index 6f23d466..a919117b 100644
--- a/mappings/partial/postalcode.json
+++ b/mappings/partial/postalcode.json
@@ -8,7 +8,8 @@
       "type": "text",
       "analyzer": "peliasIndexOneEdgeGram",
       "search_analyzer": "peliasZip",
-      "similarity": "peliasDefaultSimilarity"
+      "similarity": "peliasDefaultSimilarity",
+      "norms": false
     }
   }
 }
diff --git a/test/compile.js b/test/compile.js
index 719dde7a..2fc674d4 100644
--- a/test/compile.js
+++ b/test/compile.js
@@ -44,7 +44,8 @@ module.exports.tests.dynamic_templates = function(test, common) {
       type: 'text',
       analyzer: 'peliasIndexOneEdgeGram',
       search_analyzer: 'peliasQuery',
-      similarity: 'peliasDefaultSimilarity'
+      similarity: 'peliasDefaultSimilarity',
+      norms: false
     });
     t.end();
   });
@@ -69,7 +70,8 @@ module.exports.tests.dynamic_templates = function(test, common) {
     t.deepEqual(template.mapping, {
       type: 'keyword',
       index: false,
-      doc_values: false
+      doc_values: false,
+      norms: false
     });
     t.end();
   });
diff --git a/test/fixtures/expected.json b/test/fixtures/expected.json
index 6e58831e..b4f73cfe 100644
--- a/test/fixtures/expected.json
+++ b/test/fixtures/expected.json
@@ -2415,7 +2415,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2430,7 +2431,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2453,7 +2455,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2468,7 +2471,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2491,7 +2495,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2506,7 +2511,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2529,7 +2535,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2544,7 +2551,8 @@
                 "analyzer": "peliasIndexCountryAbbreviationOneEdgeGram",
                 "search_analyzer": "peliasQuery",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2567,7 +2575,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2582,7 +2591,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2605,7 +2615,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2620,7 +2631,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2643,7 +2655,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2658,7 +2671,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2681,7 +2695,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2696,7 +2711,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2719,7 +2735,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2734,7 +2751,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2757,7 +2775,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2772,7 +2791,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2795,7 +2815,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2810,7 +2831,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2833,7 +2855,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2848,7 +2871,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2871,7 +2895,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2886,7 +2911,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2909,7 +2935,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2924,7 +2951,8 @@
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasAdmin",
                 "similarity": "peliasDefaultSimilarity",
-                "doc_values": false
+                "doc_values": false,
+                "norms": false
               }
             }
           },
@@ -2946,7 +2974,8 @@
                 "type": "text",
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasZip",
-                "similarity": "peliasDefaultSimilarity"
+                "similarity": "peliasDefaultSimilarity",
+                "norms": false
               }
             }
           },
@@ -2960,7 +2989,8 @@
                 "type": "text",
                 "analyzer": "peliasIndexOneEdgeGram",
                 "search_analyzer": "peliasZip",
-                "similarity": "peliasDefaultSimilarity"
+                "similarity": "peliasDefaultSimilarity",
+                "norms": false
               }
             }
           },
@@ -3014,7 +3044,8 @@
             "type": "text",
             "analyzer": "peliasIndexOneEdgeGram",
             "search_analyzer": "peliasQuery",
-            "similarity": "peliasDefaultSimilarity"
+            "similarity": "peliasDefaultSimilarity",
+            "norms": false
           }
         }
       },
@@ -3037,7 +3068,8 @@
           "mapping": {
             "type": "keyword",
             "index": false,
-            "doc_values": false
+            "doc_values": false,
+            "norms": false
           }
         }
       }
@@ -3050,4 +3082,4 @@
     },
     "dynamic": "strict"
   }
-}
+}
\ No newline at end of file