diff --git a/frontend/src/MovieFile/Editor/MovieFileEditorTableContentConnector.js b/frontend/src/MovieFile/Editor/MovieFileEditorTableContentConnector.js
index 6b69480ea..7597741fe 100644
--- a/frontend/src/MovieFile/Editor/MovieFileEditorTableContentConnector.js
+++ b/frontend/src/MovieFile/Editor/MovieFileEditorTableContentConnector.js
@@ -11,20 +11,25 @@ import MovieFileEditorTableContent from './MovieFileEditorTableContent';
 
 function createMapStateToProps() {
   return createSelector(
+    (state, { movieId }) => movieId,
     (state) => state.movieFiles,
     (state) => state.settings.languages,
     (state) => state.settings.qualityProfiles,
     createMovieSelector(),
     (
+      movieId,
       movieFiles,
       languageProfiles,
       qualityProfiles
     ) => {
       const languages = languageProfiles.items;
       const qualities = getQualities(qualityProfiles.schema.items);
+      const filesForMovie = movieFiles.items.filter((obj) => {
+        return obj.movieId === movieId;
+      });
 
       return {
-        items: movieFiles.items,
+        items: filesForMovie,
         isDeleting: movieFiles.isDeleting,
         isSaving: movieFiles.isSaving,
         error: null,
diff --git a/frontend/src/MovieFile/Extras/ExtraFileTableContentConnector.js b/frontend/src/MovieFile/Extras/ExtraFileTableContentConnector.js
index 38a2720f6..0454bb3f5 100644
--- a/frontend/src/MovieFile/Extras/ExtraFileTableContentConnector.js
+++ b/frontend/src/MovieFile/Extras/ExtraFileTableContentConnector.js
@@ -7,13 +7,19 @@ import ExtraFileTableContent from './ExtraFileTableContent';
 
 function createMapStateToProps() {
   return createSelector(
+    (state, { movieId }) => movieId,
     (state) => state.extraFiles,
     createMovieSelector(),
     (
-      ExtraFiles
+      movieId,
+      extraFiles
     ) => {
+      const filesForMovie = extraFiles.items.filter((obj) => {
+        return obj.movieId === movieId;
+      });
+
       return {
-        items: ExtraFiles.items,
+        items: filesForMovie,
         error: null
       };
     }