diff --git a/src/UI/Implementation/Component/Item/Renderer.php b/src/UI/Implementation/Component/Item/Renderer.php
index 517ec6d83cf5..586365dfa2d5 100644
--- a/src/UI/Implementation/Component/Item/Renderer.php
+++ b/src/UI/Implementation/Component/Item/Renderer.php
@@ -188,8 +188,8 @@ protected function renderShy(Shy $component, RendererInterface $default_renderer
                     $value = htmlentities($value);
                 }
                 $tpl->setCurrentBlock("property_row");
-                $tpl->setVariable("PROP_NAME_A", $name);
-                $tpl->setVariable("PROP_VAL_A", $value);
+                $tpl->setVariable("PROP_NAME", $name);
+                $tpl->setVariable("PROP_VAL", $value);
                 $tpl->parseCurrentBlock();
             }
             $tpl->setCurrentBlock("properties");
@@ -338,19 +338,15 @@ protected function renderProperties(Item $component, RendererInterface $default_
                     //should introduce here htmlentities
                     $value = $value;
                 }
-                $cnt++;
-                if ($cnt % 2 == 1) {
+                $tpl->setCurrentBlock("property_cell");
+                $tpl->setVariable("PROP_NAME", $name);
+                $tpl->setVariable("PROP_VAL", $value);
+                $tpl->parseCurrentBlock();
+                if ($cnt % 2 === 1 || array_key_last($props) === $name) {
                     $tpl->setCurrentBlock("property_row");
-                    $tpl->setVariable("PROP_NAME_A", $name);
-                    $tpl->setVariable("PROP_VAL_A", $value);
-                } else {
-                    $tpl->setVariable("PROP_NAME_B", $name);
-                    $tpl->setVariable("PROP_VAL_B", $value);
                     $tpl->parseCurrentBlock();
                 }
-            }
-            if ($cnt % 2 == 1) {
-                $tpl->parseCurrentBlock();
+                $cnt++;
             }
             $tpl->setCurrentBlock("properties");
             $tpl->parseCurrentBlock();
diff --git a/src/UI/templates/default/Item/tpl.item_notification.html b/src/UI/templates/default/Item/tpl.item_notification.html
index 9dc7c9678dc5..b82b3ba06f9e 100644
--- a/src/UI/templates/default/Item/tpl.item_notification.html
+++ b/src/UI/templates/default/Item/tpl.item_notification.html
@@ -20,12 +20,11 @@ <h4 class="il-item-notification-title">{TITLE}</h4>
 				<hr class="il-item-divider">
 				<!-- BEGIN property_row -->
 				<div class="row il-item-properties">
+					<!-- BEGIN property_cell -->
 					<div class="col-sm-12 il-multi-line-cap-3">
-						<span class="il-item-property-name">{PROP_NAME_A}</span><span class="il-item-property-value">{PROP_VAL_A}</span>
-					</div>
-					<div class="col-sm-12 il-multi-line-cap-3">
-						<span class="il-item-property-name">{PROP_NAME_B}</span><span class="il-item-property-value">{PROP_VAL_B}</span>
+						<span class="il-item-property-name">{PROP_NAME}</span><span class="il-item-property-value">{PROP_VAL}</span>
 					</div>
+					<!-- END property_cell -->
 				</div>
 				<!-- END property_row -->
 				<!-- END properties -->
@@ -37,4 +36,4 @@ <h4 class="il-item-notification-title">{TITLE}</h4>
 			</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/UI/templates/default/Item/tpl.item_shy.html b/src/UI/templates/default/Item/tpl.item_shy.html
index 44ba7df329a6..012849eb5470 100644
--- a/src/UI/templates/default/Item/tpl.item_shy.html
+++ b/src/UI/templates/default/Item/tpl.item_shy.html
@@ -9,8 +9,8 @@
 		<hr class="il-item-divider" />
 		<!-- BEGIN property_row -->
 		<div class="il-item-properties">
-			<div class="il-item-property-name">{PROP_NAME_A}</div>
-			<div class="il-item-property-value">{PROP_VAL_A}</div>
+			<div class="il-item-property-name">{PROP_NAME}</div>
+			<div class="il-item-property-value">{PROP_VAL}</div>
 		</div>
 		<!-- END property_row -->
 		<!-- END properties -->
diff --git a/src/UI/templates/default/Item/tpl.item_standard.html b/src/UI/templates/default/Item/tpl.item_standard.html
index ba8dca02d767..2895298910eb 100644
--- a/src/UI/templates/default/Item/tpl.item_standard.html
+++ b/src/UI/templates/default/Item/tpl.item_standard.html
@@ -50,12 +50,11 @@ <h4 class="il-item-title">{TITLE}</h4>
 			<hr class="il-item-divider" />
 			<!-- BEGIN property_row -->
 			<div class="row">
+				<!-- BEGIN property_cell -->
 				<div class="col-md-6 il-multi-line-cap-3">
-					<span class="il-item-property-name">{PROP_NAME_A}</span><span class="il-item-property-value">{PROP_VAL_A}</span>
-				</div>
-				<div class="col-md-6 il-multi-line-cap-3">
-					<span class="il-item-property-name">{PROP_NAME_B}</span><span class="il-item-property-value">{PROP_VAL_B}</span>
+					<span class="il-item-property-name">{PROP_NAME}</span><span class="il-item-property-value">{PROP_VAL}</span>
 				</div>
+				<!-- END property_cell -->
 			</div>
 			<!-- END property_row -->
 			<!-- END properties -->
@@ -72,4 +71,4 @@ <h4 class="il-item-title">{TITLE}</h4>
 			<!-- BEGIN lead_end -->
 		</div>
 	</div><!-- END lead_end -->
-</div>
\ No newline at end of file
+</div>
diff --git a/tests/UI/Component/Item/ItemTest.php b/tests/UI/Component/Item/ItemTest.php
index d266baea659e..2982b068f381 100644
--- a/tests/UI/Component/Item/ItemTest.php
+++ b/tests/UI/Component/Item/ItemTest.php
@@ -242,9 +242,6 @@ public function testRenderBase(): void
                 <div class="col-md-6 il-multi-line-cap-3">
 					<span class="il-item-property-name">Location</span><span class="il-item-property-value">Room 123, Main Street 44, 3012 Bern</span>
 				</div>
-				<div class="col-md-6 il-multi-line-cap-3">
-					<span class="il-item-property-name"></span><span class="il-item-property-value"></span>
-				</div>
 			</div>
         </div>
 EOT;