diff --git a/frontend/src/Activity/History/HistoryEventTypeCell.js b/frontend/src/Activity/History/HistoryEventTypeCell.js
index 5e02409ea..6494bb08f 100644
--- a/frontend/src/Activity/History/HistoryEventTypeCell.js
+++ b/frontend/src/Activity/History/HistoryEventTypeCell.js
@@ -38,9 +38,9 @@ function getTooltip(eventType, data) {
     case 'grabbed':
       return `Album grabbed from ${data.indexer} and sent to ${data.downloadClient}`;
     case 'seriesFolderImported':
-      return 'Album imported from artist folder';
+      return 'Track imported from artist folder';
     case 'downloadFolderImported':
-      return 'Album downloaded successfully and picked up from download client';
+      return 'Track downloaded successfully and picked up from download client';
     case 'downloadFailed':
       return 'Album download failed';
     case 'trackFileDeleted':
diff --git a/frontend/src/Activity/History/HistoryRowConnector.js b/frontend/src/Activity/History/HistoryRowConnector.js
index 036a4e240..d8fab748d 100644
--- a/frontend/src/Activity/History/HistoryRowConnector.js
+++ b/frontend/src/Activity/History/HistoryRowConnector.js
@@ -13,10 +13,10 @@ function createMapStateToProps() {
     createArtistSelector(),
     createEpisodeSelector(),
     createUISettingsSelector(),
-    (artist, episode, uiSettings) => {
+    (artist, album, uiSettings) => {
       return {
         artist,
-        episode,
+        album,
         shortDateFormat: uiSettings.shortDateFormat,
         timeFormat: uiSettings.timeFormat
       };
diff --git a/frontend/src/Store/Selectors/createEpisodeSelector.js b/frontend/src/Store/Selectors/createEpisodeSelector.js
index 6725cadd9..3f0c676f8 100644
--- a/frontend/src/Store/Selectors/createEpisodeSelector.js
+++ b/frontend/src/Store/Selectors/createEpisodeSelector.js
@@ -4,10 +4,10 @@ import episodeEntities from 'Episode/episodeEntities';
 
 function createEpisodeSelector() {
   return createSelector(
-    (state, { episodeId }) => episodeId,
+    (state, { albumId }) => albumId,
     (state, { episodeEntity = episodeEntities.EPISODES }) => _.get(state, episodeEntity, { items: [] }),
-    (episodeId, episodes) => {
-      return _.find(episodes.items, { id: episodeId });
+    (albumId, episodes) => {
+      return _.find(episodes.items, { id: albumId });
     }
   );
 }