diff --git a/frontend/src/Collection/Overview/CollectionOverviews.js b/frontend/src/Collection/Overview/CollectionOverviews.js
index 1e9fbef95..5ba0c5509 100644
--- a/frontend/src/Collection/Overview/CollectionOverviews.js
+++ b/frontend/src/Collection/Overview/CollectionOverviews.js
@@ -54,7 +54,7 @@ class CollectionOverviews extends Component {
       posterWidth: 162,
       posterHeight: 238,
       rowHeight: calculateRowHeight(238, null, props.isSmallScreen, {}),
-      navigateToId: props.location.state ? props.location.state.navigateToId : 0
+      navigateToId: props.location.state?.navigateToId ?? 0
     };
 
     this._grid = null;
diff --git a/frontend/src/Movie/MovieCollectionLabel.js b/frontend/src/Movie/MovieCollectionLabel.js
index 5f7400144..8789adb43 100644
--- a/frontend/src/Movie/MovieCollectionLabel.js
+++ b/frontend/src/Movie/MovieCollectionLabel.js
@@ -51,7 +51,7 @@ MovieCollectionLabel.propTypes = {
   title: PropTypes.string.isRequired,
   monitored: PropTypes.bool.isRequired,
   onMonitorTogglePress: PropTypes.func.isRequired,
-  tmdbId: PropTypes.string.isRequired
+  tmdbId: PropTypes.number.isRequired
 };
 
 export default MovieCollectionLabel;