diff --git a/ui/src/common/DateField.js b/ui/src/common/DateField.js
new file mode 100644
index 000000000..fab15b53c
--- /dev/null
+++ b/ui/src/common/DateField.js
@@ -0,0 +1,13 @@
+import React from 'react'
+import { DateField as RADateField } from 'react-admin'
+
+export const DateField = (props) => {
+  const { record, source } = props
+  const value = record?.[source]
+  if (value === '0001-01-01T00:00:00Z' || value === null) return null
+  return <RADateField {...props} />
+}
+
+DateField.defaultProps = {
+  addLabel: true,
+}
diff --git a/ui/src/common/index.js b/ui/src/common/index.js
index a722a7492..98135e8ad 100644
--- a/ui/src/common/index.js
+++ b/ui/src/common/index.js
@@ -3,6 +3,7 @@ export * from './ArtistLinkField'
 export * from './BatchPlayButton'
 export * from './BitrateField'
 export * from './ContextMenus'
+export * from './DateField'
 export * from './DocLink'
 export * from './DurationField'
 export * from './List'
diff --git a/ui/src/song/SongList.js b/ui/src/song/SongList.js
index 246e0049a..57736ac53 100644
--- a/ui/src/song/SongList.js
+++ b/ui/src/song/SongList.js
@@ -1,6 +1,5 @@
 import React from 'react'
 import {
-  DateField,
   Filter,
   FunctionField,
   NumberField,
@@ -10,6 +9,7 @@ import {
 import { useMediaQuery } from '@material-ui/core'
 import FavoriteIcon from '@material-ui/icons/Favorite'
 import {
+  DateField,
   DurationField,
   List,
   SongContextMenu,
diff --git a/ui/src/user/UserList.js b/ui/src/user/UserList.js
index f2dd33d78..68822ee9c 100644
--- a/ui/src/user/UserList.js
+++ b/ui/src/user/UserList.js
@@ -3,13 +3,12 @@ import {
   BooleanField,
   Datagrid,
   Filter,
-  DateField,
   SearchInput,
   SimpleList,
   TextField,
 } from 'react-admin'
 import { useMediaQuery } from '@material-ui/core'
-import { List } from '../common'
+import { List, DateField } from '../common'
 
 const UserFilter = (props) => (
   <Filter {...props} variant={'outlined'}>