diff --git a/views/stockentries.blade.php b/views/stockentries.blade.php
index 211296a9..0336b3e0 100644
--- a/views/stockentries.blade.php
+++ b/views/stockentries.blade.php
@@ -241,7 +241,7 @@
 						<span id="stock-{{ $stockEntry->id }}-due-date">{{ $stockEntry->best_before_date }}</span>
 						<time id="stock-{{ $stockEntry->id }}-due-date-timeago"
 							class="timeago timeago-contextual"
-							datetime="{{ $stockEntry->best_before_date }} 23:59:59"></time>
+							@if($stockEntry->best_before_date != "") datetime="{{ $stockEntry->best_before_date }} 23:59:59" @endif></time>
 					</td>
 					<td id="stock-{{ $stockEntry->id }}-location"
 						class="@if(!GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING) d-none @endif"
@@ -265,7 +265,7 @@
 						<span id="stock-{{ $stockEntry->id }}-purchased-date">{{ $stockEntry->purchased_date }}</span>
 						<time id="stock-{{ $stockEntry->id }}-purchased-date-timeago"
 							class="timeago timeago-contextual"
-							datetime="{{ $stockEntry->purchased_date }} 23:59:59"></time>
+							@if($stockEntry->purchased_date != "") datetime="{{ $stockEntry->purchased_date }} 23:59:59" @endif></time>
 					</td>
 					<td class="d-none">{{ $stockEntry->purchased_date }}</td>
 					<td>
diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php
index da4103d9..24974d5b 100755
--- a/views/stockoverview.blade.php
+++ b/views/stockoverview.blade.php
@@ -352,7 +352,7 @@
 						<span id="product-{{ $currentStockEntry->product_id }}-next-due-date">{{ $currentStockEntry->best_before_date }}</span>
 						<time id="product-{{ $currentStockEntry->product_id }}-next-due-date-timeago"
 							class="timeago timeago-contextual"
-							datetime="{{ $currentStockEntry->best_before_date }} 23:59:59"></time>
+							@if($currentStockEntry->best_before_date != "") datetime="{{ $currentStockEntry->best_before_date }} 23:59:59" @endif></time>
 					</td>
 					<td class="d-none">
 						@foreach(FindAllObjectsInArrayByPropertyValue($currentStockLocations, 'product_id', $currentStockEntry->product_id) as $locationsForProduct)