diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index 328786e2..01583e5f 100644
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -177,18 +177,20 @@
         }
     }
 
-
-
     if ($bIncludeKeywords)
     {
         headline('Name Keywords');
-        foreach ($aPlaceSearchNameKeywords as $aRow) {
-            _one_keyword_row($aRow['word_token'], $aRow['word_id']);
+        if ($aPlaceSearchNameKeywords) {
+            foreach ($aPlaceSearchNameKeywords as $aRow) {
+                _one_keyword_row($aRow['word_token'], $aRow['word_id']);
+            }
         }
 
         headline('Address Keywords');
-        foreach ($aPlaceSearchAddressKeywords as $aRow) {
-            _one_keyword_row($aRow['word_token'], $aRow['word_id']);
+        if ($aPlaceSearchAddressKeywords) {
+            foreach ($aPlaceSearchAddressKeywords as $aRow) {
+                _one_keyword_row($aRow['word_token'], $aRow['word_id']);
+            }
         }
     }
 
diff --git a/test/bdd/api/details/params.feature b/test/bdd/api/details/params.feature
index a0b990eb..3c9286ed 100644
--- a/test/bdd/api/details/params.feature
+++ b/test/bdd/api/details/params.feature
@@ -41,3 +41,16 @@ Feature: Object details
             | linkedplaces |
             | 1 |
         Then the result is valid json
+
+    Scenario Outline: HTML Details with keywords
+        When sending html details query for <osmid>
+            | keywords |
+            | 1 |
+        Then the result is valid html
+
+    Examples:
+            | osmid |
+            | W78099902 |
+            | N3121929846 |
+
+