diff --git a/changelog/58_UNRELEASED_2020-xx-xx.md b/changelog/58_UNRELEASED_2020-xx-xx.md
index 63166a42..9c160e0b 100644
--- a/changelog/58_UNRELEASED_2020-xx-xx.md
+++ b/changelog/58_UNRELEASED_2020-xx-xx.md
@@ -13,6 +13,7 @@
 - Fixed that when editing an ingredient with "Only check if a single unit is in stock" set, the quantity unit was always set to the products stock quantity unit regardless if a different one was selected for that ingredient
 - Fixed a PHP notice on the recipes page when there are no recipes (thanks @mrunkel)
 - Fixed the conversion factor hint to display also decimal places on the purchase page (only displayed when the product has a different purchase/stock quantity unit)
+- Fixed that the stock entries page was broken when there were product userfields defined with enabled "Show as column in tables"
 
 ### Calendar fixes
 - Fixed that the "Share/Integrate calendar (iCal)" button did not work (thanks @tsia)
diff --git a/localization/strings.pot b/localization/strings.pot
index 3816da0e..8b9338d7 100644
--- a/localization/strings.pot
+++ b/localization/strings.pot
@@ -1777,6 +1777,3 @@ msgstr ""
 
 msgid "Mark this stock entry as open"
 msgstr ""
-
-msgid ""
-msgstr ""
diff --git a/views/stockentries.blade.php b/views/stockentries.blade.php
index 9f592072..970bbf00 100644
--- a/views/stockentries.blade.php
+++ b/views/stockentries.blade.php
@@ -158,6 +158,12 @@
 						<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>
 					</td>
+
+					@include('components.userfields_tbody', array(
+						'userfields' => $userfields,
+						'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $stockEntry->product_id)
+					))
+
 				</tr>
 				@endforeach
 			</tbody>