diff --git a/frontend/src/Movie/Details/MovieDetails.js b/frontend/src/Movie/Details/MovieDetails.js
index 33d8c73fe3..758502393c 100644
--- a/frontend/src/Movie/Details/MovieDetails.js
+++ b/frontend/src/Movie/Details/MovieDetails.js
@@ -429,26 +429,31 @@ class MovieDetails extends Component {
                         null
                     }
 
-                    {
-                      year > 0 ?
-                        <span className={styles.year}>
-                          <Popover
-                            anchor={
-                              year
-                            }
-                            title={translate('ReleaseDates')}
-                            body={
-                              <MovieReleaseDates
-                                inCinemas={inCinemas}
-                                digitalRelease={digitalRelease}
-                                physicalRelease={physicalRelease}
-                              />
-                            }
-                            position={tooltipPositions.BOTTOM}
+                    <span className={styles.year}>
+                      <Popover
+                        anchor={
+                          year > 0 ? (
+                            year
+                          ) : (
+                            <Icon
+                              name={icons.WARNING}
+                              kind={kinds.WARNING}
+                              size={20}
+                            />
+                          )
+                        }
+                        title={translate('ReleaseDates')}
+                        body={
+                          <MovieReleaseDates
+                            tmdbId={tmdbId}
+                            inCinemas={inCinemas}
+                            digitalRelease={digitalRelease}
+                            physicalRelease={physicalRelease}
                           />
-                        </span> :
-                        null
-                    }
+                        }
+                        position={tooltipPositions.BOTTOM}
+                      />
+                    </span>
 
                     {
                       runtime ?
diff --git a/frontend/src/Movie/Details/MovieReleaseDates.tsx b/frontend/src/Movie/Details/MovieReleaseDates.tsx
index ed5c490ed4..0805026ab3 100644
--- a/frontend/src/Movie/Details/MovieReleaseDates.tsx
+++ b/frontend/src/Movie/Details/MovieReleaseDates.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
 import Icon from 'Components/Icon';
+import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
 import { icons } from 'Helpers/Props';
 import Movie from 'Movie/Movie';
 import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
@@ -11,10 +12,11 @@ import styles from './MovieReleaseDates.css';
 
 type MovieReleaseDatesProps = Pick<
   Movie,
-  'inCinemas' | 'digitalRelease' | 'physicalRelease'
+  'tmdbId' | 'inCinemas' | 'digitalRelease' | 'physicalRelease'
 >;
 
 function MovieReleaseDates({
+  tmdbId,
   inCinemas,
   digitalRelease,
   physicalRelease,
@@ -28,7 +30,12 @@ function MovieReleaseDates({
         <div className={styles.dateIcon}>
           <Icon name={icons.MISSING} />
         </div>
-        {translate('NoMovieReleaseDatesAvailable')}
+
+        <InlineMarkdown
+          data={translate('NoMovieReleaseDatesAvailable', {
+            url: `https://www.themoviedb.org/movie/${tmdbId}`,
+          })}
+        />
       </div>
     );
   }
diff --git a/frontend/src/Movie/Index/Table/MovieIndexRow.tsx b/frontend/src/Movie/Index/Table/MovieIndexRow.tsx
index de6857a1f8..cf4b48c104 100644
--- a/frontend/src/Movie/Index/Table/MovieIndexRow.tsx
+++ b/frontend/src/Movie/Index/Table/MovieIndexRow.tsx
@@ -236,7 +236,7 @@ function MovieIndexRow(props: MovieIndexRowProps) {
         if (name === 'year') {
           return (
             <VirtualTableRowCell key={name} className={styles[name]}>
-              {year}
+              {year > 0 ? year : null}
             </VirtualTableRowCell>
           );
         }
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index a5dc41ce0c..cf260db725 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -1049,7 +1049,7 @@
   "NoMinimumForAnyRuntime": "No minimum for any runtime",
   "NoMoveFilesSelf": " No, I'll Move the Files Myself",
   "NoMovieFilesToManage": "No movie files to manage.",
-  "NoMovieReleaseDatesAvailable": "No release dates available on TMDb for this movie.",
+  "NoMovieReleaseDatesAvailable": "No release dates available on [TMDb]({url}) for this movie.",
   "NoMoviesExist": "No movies found, to get started you'll want to add a new movie or import some existing ones.",
   "NoResultsFound": "No results found",
   "NoTagsHaveBeenAddedYet": "No tags have been added yet",