diff --git a/frontend/src/Album/Details/AlbumDetails.js b/frontend/src/Album/Details/AlbumDetails.js
index f4aa8146f..ebac3a71d 100644
--- a/frontend/src/Album/Details/AlbumDetails.js
+++ b/frontend/src/Album/Details/AlbumDetails.js
@@ -423,7 +423,7 @@ class AlbumDetails extends Component {
                         size={17}
                       />
                       <span className={styles.releaseDate}>
-                        {releaseDate ?
+                        {releaseDate && releaseDate !== '0001-01-01T00:00:00Z' ?
                           moment(releaseDate).format(shortDateFormat) :
                           translate('Unknown')
                         }
diff --git a/frontend/src/Artist/Details/AlbumRow.js b/frontend/src/Artist/Details/AlbumRow.js
index 893e5ca77..750287fce 100644
--- a/frontend/src/Artist/Details/AlbumRow.js
+++ b/frontend/src/Artist/Details/AlbumRow.js
@@ -193,6 +193,20 @@ class AlbumRow extends Component {
             }
 
             if (name === 'releaseDate') {
+              if ( ! releaseDate ) {
+                return (
+                  <TableRowCell key={name} />
+                );
+              }
+
+              if ( releaseDate === '0001-01-01T00:00:00Z' ) {
+                return (
+                  <TableRowCell key={name}>
+                    {translate('Unknown')}
+                  </TableRowCell>
+                );
+              }
+
               return (
                 <RelativeDateCellConnector
                   key={name}