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 8a9a7a6b9..5fb46e764 100644
--- a/frontend/src/Artist/Details/AlbumRow.js
+++ b/frontend/src/Artist/Details/AlbumRow.js
@@ -193,12 +193,25 @@ class AlbumRow extends Component {
             }
 
             if (name === 'releaseDate') {
+              if ( releaseDate && releaseDate !== '0001-01-01T00:00:00Z' ) {
+                return (
+                  <RelativeDateCellConnector
+                    key={name}
+                    date={releaseDate}
+                  />
+                );
+              }
               return (
-                <RelativeDateCellConnector
-                  key={name}
-                  date={releaseDate}
-                />
+                <TableRowCell key={name}>
+                  { // This is probably a temporary thing. When the metadata server is in full health, this should not happen.
+                    // We can either delete it or add a proper translation if we decide to keep it.
+                    releaseDate ?
+                      translate('Unknown') :
+                      'No metadata'
+                  }
+                </TableRowCell>
               );
+
             }
 
             if (name === 'size') {