diff --git a/library/Notifications/Widget/Detail/IncidentDetail.php b/library/Notifications/Widget/Detail/IncidentDetail.php
index a88036d8..3db1b4da 100644
--- a/library/Notifications/Widget/Detail/IncidentDetail.php
+++ b/library/Notifications/Widget/Detail/IncidentDetail.php
@@ -92,17 +92,22 @@ protected function createSource()
         ];
     }
 
-    protected function createObjectTag()
+    protected function createObjectTag(): array
     {
-        $objectTags = (new Table())->addAttributes(['class' => 'object-tags-table']);
-
+        $tags = [];
         foreach ($this->incident->object->object_extra_tag as $extraTag) {
-            $objectTags->addHtml(Table::row([$extraTag->tag, $extraTag->value]));
+            $tags[] = Table::row([$extraTag->tag, $extraTag->value]);
+        }
+
+        if (empty($tags)) {
+            return $tags;
         }
 
         return [
-            Html::tag('h2', t('Object Tags')),
-            $objectTags
+            new HtmlElement('h2', null,  new Text(t('Object Tags'))),
+            (new Table())
+                ->addHtml(...$tags)
+                ->addAttributes(['class' => 'object-tags-table'])
         ];
     }