diff --git a/server/ntb/publish/ntb_nitf.py b/server/ntb/publish/ntb_nitf.py
index d4fff26ac..4819e8b1a 100644
--- a/server/ntb/publish/ntb_nitf.py
+++ b/server/ntb/publish/ntb_nitf.py
@@ -78,7 +78,7 @@ def format(self, original_article, subscriber, codes=None, encoding="us-ascii"):
         if tz is None:
             # first time this method is launched
             # we set timezone and NTB specific filter
-            tz = pytz.timezone(app.config["DEFAULT_TIMEZONE"])
+            tz = pytz.timezone(app.config.get("DEFAULT_TIMEZONE", "Europe/Oslo"))
         try:
             if article.get("body_html"):
                 article["body_html"] = article["body_html"].replace("<br>", "<br />")
diff --git a/server/ntb/publish/ntb_nitf_multiservice.py b/server/ntb/publish/ntb_nitf_multiservice.py
index 3be6ee9a6..a4ef7a4b4 100644
--- a/server/ntb/publish/ntb_nitf_multiservice.py
+++ b/server/ntb/publish/ntb_nitf_multiservice.py
@@ -48,10 +48,6 @@ def _format_slugline(self, article, tobject):
         """Avoid slugline in key-list."""
         pass
 
-    def _format_docdata(self, article, docdata):
-        super()._format_docdata(article, docdata)
-        self._format_imatrics_entities(article, docdata)
-
     def _format_imatrics_entities(self, article, docdata):
         imatrics_topics = [
             s
diff --git a/server/ntb/tests/publish/ntb_nitf_multiservice_test.py b/server/ntb/tests/publish/ntb_nitf_multiservice_test.py
index 9847fadbe..3481bebe3 100644
--- a/server/ntb/tests/publish/ntb_nitf_multiservice_test.py
+++ b/server/ntb/tests/publish/ntb_nitf_multiservice_test.py
@@ -48,7 +48,7 @@ def setUp(self):
         self.nitf_xml = etree.fromstring(self.doc, None)
 
     def test_imatrics_entities(self):
-        keywords = self.nitf_xml.findall("head/docdata/key-list/keyword")
+        keywords = self.nitf_xml.findall(".//keyword")
         self.assertEqual(4, len(keywords))
         self.assertEqual(keywords[0].get("key"), "Olje")
         self.assertEqual(keywords[1].get("key"), "Stortinget")