diff --git a/src/Services/LabelSystem/PlaceholderProviders/PartLotProvider.php b/src/Services/LabelSystem/PlaceholderProviders/PartLotProvider.php
index 38dc9cf7..6b67e287 100644
--- a/src/Services/LabelSystem/PlaceholderProviders/PartLotProvider.php
+++ b/src/Services/LabelSystem/PlaceholderProviders/PartLotProvider.php
@@ -63,7 +63,6 @@ final class PartLotProvider implements PlaceholderProviderInterface
                     Locale::getDefault(),
                     IntlDateFormatter::SHORT,
                     IntlDateFormatter::NONE
-                //$label_target->getExpirationDate()->getTimezone()
                 );
 
                 return $formatter->format($label_target->getExpirationDate());
diff --git a/src/Services/LabelSystem/PlaceholderProviders/TimestampableElementProvider.php b/src/Services/LabelSystem/PlaceholderProviders/TimestampableElementProvider.php
index d4b5ac0a..581a5e88 100644
--- a/src/Services/LabelSystem/PlaceholderProviders/TimestampableElementProvider.php
+++ b/src/Services/LabelSystem/PlaceholderProviders/TimestampableElementProvider.php
@@ -32,12 +32,14 @@ final class TimestampableElementProvider implements PlaceholderProviderInterface
     public function replace(string $placeholder, object $label_target, array $options = []): ?string
     {
         if ($label_target instanceof TimeStampableInterface) {
+            $formatter = new IntlDateFormatter(Locale::getDefault(), IntlDateFormatter::SHORT, IntlDateFormatter::SHORT);
+
             if ('[[LAST_MODIFIED]]' === $placeholder) {
-                return IntlDateFormatter::formatObject($label_target->getLastModified() ?? new \DateTime(), IntlDateFormatter::SHORT, Locale::getDefault());
+                return $formatter->format($label_target->getLastModified() ?? new \DateTime());
             }
 
             if ('[[CREATION_DATE]]' === $placeholder) {
-                return IntlDateFormatter::formatObject($label_target->getAddedDate() ?? new \DateTime(), IntlDateFormatter::SHORT, Locale::getDefault());
+                return $formatter->format($label_target->getAddedDate() ?? new \DateTime());
             }
         }
 
diff --git a/tests/Services/LabelSystem/PlaceholderProviders/TimestampableElementProviderTest.php b/tests/Services/LabelSystem/PlaceholderProviders/TimestampableElementProviderTest.php
index a4b9611b..d251f744 100644
--- a/tests/Services/LabelSystem/PlaceholderProviders/TimestampableElementProviderTest.php
+++ b/tests/Services/LabelSystem/PlaceholderProviders/TimestampableElementProviderTest.php
@@ -59,11 +59,10 @@ class TimestampableElementProviderTest extends WebTestCase
     public function dataProvider(): array
     {
         \Locale::setDefault('en');
-        $formatted = \IntlDateFormatter::formatObject(new \DateTime('2000-01-01'), \IntlDateFormatter::SHORT);
 
         return [
-            [$formatted, '[[LAST_MODIFIED]]'],
-            [$formatted, '[[CREATION_DATE]]'],
+            ['1/1/00, 12:00 AM', '[[LAST_MODIFIED]]'],
+            ['1/1/00, 12:00 AM', '[[CREATION_DATE]]'],
         ];
     }