diff --git a/admin/timescale/create_indexes.sql b/admin/timescale/create_indexes.sql
index 093abaf89b..737d1147e8 100644
--- a/admin/timescale/create_indexes.sql
+++ b/admin/timescale/create_indexes.sql
@@ -81,7 +81,7 @@ CREATE UNIQUE INDEX similar_artist_credit_mbids_reverse_uniq_idx ON similarity.a
 
 CREATE INDEX similarity_overhyped_artists_artist_mbid_idx ON similarity.overhyped_artists(artist_mbid) INCLUDE (factor);
 
-CREATE INDEX mbid_manual_mapping_top_idx ON mbid_manual_mapping_top (recording_msid) INCLUDE (recording_mbid);
+CREATE INDEX mbid_manual_mapping_top_idx ON mbid_manual_mapping_top (recording_msid) INCLUDE (recording_mbid, release_mbid);
 
 CREATE INDEX popularity_recording_listen_count_idx ON popularity.recording (total_listen_count) INCLUDE (recording_mbid);
 CREATE INDEX popularity_recording_user_count_idx ON popularity.recording (total_user_count) INCLUDE (recording_mbid);
diff --git a/admin/timescale/create_tables.sql b/admin/timescale/create_tables.sql
index 035c5eed07..56d6799a75 100644
--- a/admin/timescale/create_tables.sql
+++ b/admin/timescale/create_tables.sql
@@ -62,6 +62,7 @@ CREATE TABLE mbid_manual_mapping(
     id             INTEGER GENERATED ALWAYS AS IDENTITY NOT NULL,
     recording_msid UUID NOT NULL,
     recording_mbid UUID NOT NULL,
+    release_mbid UUID NOT NULL,
     user_id        INTEGER NOT NULL,
     created        TIMESTAMP WITH TIME ZONE DEFAULT NOW() NOT NULL
 );
diff --git a/admin/timescale/create_views.sql b/admin/timescale/create_views.sql
index cbc8c15ebd..de8e1a6516 100644
--- a/admin/timescale/create_views.sql
+++ b/admin/timescale/create_views.sql
@@ -8,9 +8,11 @@ CREATE MATERIALIZED VIEW mbid_manual_mapping_top AS (
     SELECT DISTINCT ON (recording_msid)
            recording_msid
          , recording_mbid
+         , release_mbid
       FROM mbid_manual_mapping
   GROUP BY recording_msid
          , recording_mbid
+         , release_mbid
     HAVING count(DISTINCT user_id) >= 3
   ORDER BY recording_msid
          , count(*) DESC
diff --git a/admin/timescale/updates/2024-07-04-add-release-in-mbid-mapping.sql b/admin/timescale/updates/2024-07-04-add-release-in-mbid-mapping.sql
new file mode 100644
index 0000000000..6ae0458991
--- /dev/null
+++ b/admin/timescale/updates/2024-07-04-add-release-in-mbid-mapping.sql
@@ -0,0 +1,29 @@
+BEGIN;
+
+ALTER TABLE mbid_manual_mapping ADD COLUMN release_mbid UUID NOT NULL;
+
+
+
+DROP MATERIALIZED VIEW mbid_manual_mapping_top;
+
+-- create a materialized view of the top mappings of a recording msid. top mappings are chosen
+-- by the highest number of users that have added it. if multiple mappings have same count, break
+-- ties by preferring the mapping that was created most recently. to avoid abuse, mappings are only
+-- considered for this view if at least 3 separate users created those.
+CREATE MATERIALIZED VIEW mbid_manual_mapping_top AS (
+    SELECT DISTINCT ON (recording_msid)
+           recording_msid
+         , recording_mbid
+         , release_mbid
+      FROM mbid_manual_mapping
+  GROUP BY recording_msid
+         , recording_mbid
+         , release_mbid
+    HAVING count(DISTINCT user_id) >= 3
+  ORDER BY recording_msid
+         , count(*) DESC
+         , max(created) DESC
+);
+
+
+COMMIT;
\ No newline at end of file
diff --git a/frontend/css/search-track.less b/frontend/css/search-track.less
index 9473a45dad..64e50dfd6d 100644
--- a/frontend/css/search-track.less
+++ b/frontend/css/search-track.less
@@ -18,25 +18,26 @@
   // Options within the dropdown menu
   > option, > button {
     .track-search-dropdown>a,.track-search-dropdown>button {
-    display: block;
-    width: 100%;
-    outline: inherit;
-    padding: 5px 20px;
-    font: inherit;
-    text-align: left;
-    background: none;
-    color: inherit;
-    border: none;
-    cursor: pointer;
+      display: block;
+      width: 100%;
+      outline: inherit;
+      padding: 5px 20px;
+      font: inherit;
+      text-align: left;
+      background: none;
+      color: inherit;
+      border: none;
+      cursor: pointer;
 
-    &:hover,
-    &:focus {
-      color: #fff;
-      background-color: #353070;
+      &:hover,
+      &:focus {
+        color: #fff;
+        background-color: #353070;
+      }
     }
   }
 }
 .track-search:focus-within .track-search-dropdown,
 .album-search:focus-within .track-search-dropdown {
   display: block; // show when parent container is focused
-}
+}
\ No newline at end of file
diff --git a/frontend/js/src/common/listens/MBIDMappingModal.tsx b/frontend/js/src/common/listens/MBIDMappingModal.tsx
index 4346ee13c8..1bbc62b803 100644
--- a/frontend/js/src/common/listens/MBIDMappingModal.tsx
+++ b/frontend/js/src/common/listens/MBIDMappingModal.tsx
@@ -3,6 +3,7 @@
 import NiceModal, { useModal } from "@ebay/nice-modal-react";
 import { faTimesCircle } from "@fortawesome/free-regular-svg-icons";
 import {
+  faChevronDown,
   faExchangeAlt,
   faInfoCircle,
   faQuestionCircle,
@@ -23,29 +24,22 @@ import {
   getRecordingMSID,
   getTrackName,
 } from "../../utils/utils";
+import { getListenFromRecording } from "../../user/components/AddListenModal";
+import ReleaseCard from "../../explore/fresh-releases/components/ReleaseCard";
 
 export type MBIDMappingModalProps = {
   listenToMap?: Listen;
 };
 
-function getListenFromSelectedRecording(
-  selectedRecordingMetadata?: TrackMetadata
-): Listen | undefined {
-  if (!selectedRecordingMetadata) {
-    return undefined;
-  }
-  return {
-    listened_at: 0,
-    track_metadata: selectedRecordingMetadata,
-  };
-}
-
 export default NiceModal.create(({ listenToMap }: MBIDMappingModalProps) => {
   const modal = useModal();
   const { resolve, visible } = modal;
   const [copyTextClickCounter, setCopyTextClickCounter] = React.useState(0);
   const [selectedRecording, setSelectedRecording] = React.useState<
-    TrackMetadata
+    MusicBrainzRecordingWithReleasesAndRGs
+  >();
+  const [selectedRelease, setSelectedRelease] = React.useState<
+    MusicBrainzRelease & WithReleaseGroup
   >();
 
   const closeModal = React.useCallback(() => {
@@ -92,7 +86,7 @@ export default NiceModal.create(({ listenToMap }: MBIDMappingModalProps) => {
       if (!listenToMap || !selectedRecording || !auth_token) {
         return;
       }
-      const selectedRecordingToListen = getListenFromSelectedRecording(
+      const selectedRecordingToListen = getListenFromRecording(
         selectedRecording
       );
       const recordingMBID =
@@ -104,7 +98,8 @@ export default NiceModal.create(({ listenToMap }: MBIDMappingModalProps) => {
           await APIService.submitMBIDMapping(
             auth_token,
             recordingMSID,
-            recordingMBID
+            recordingMBID,
+            selectedRelease?.id
           );
         } catch (error) {
           handleError(error, "Error while linking listen");
@@ -133,6 +128,7 @@ export default NiceModal.create(({ listenToMap }: MBIDMappingModalProps) => {
       APIService,
       selectedRecording,
       handleError,
+      selectedRelease,
     ]
   );
 
@@ -143,9 +139,9 @@ export default NiceModal.create(({ listenToMap }: MBIDMappingModalProps) => {
     );
   }, [listenToMap]);
 
-  const listenFromSelectedRecording = getListenFromSelectedRecording(
-    selectedRecording
-  );
+  const listenFromSelectedRecording = selectedRecording
+    ? getListenFromRecording(selectedRecording)
+    : undefined;
 
   if (!listenToMap) {
     return null;
@@ -251,7 +247,10 @@ export default NiceModal.create(({ listenToMap }: MBIDMappingModalProps) => {
                         title="Reset"
                         icon={faTimesCircle}
                         iconSize="lg"
-                        action={() => setSelectedRecording(undefined)}
+                        action={() => {
+                          setSelectedRecording(undefined);
+                          setSelectedRelease(undefined);
+                        }}
                       />
                     }
                   />
@@ -270,15 +269,115 @@ export default NiceModal.create(({ listenToMap }: MBIDMappingModalProps) => {
               ) : (
                 <div className="card listen-card">
                   <SearchTrackOrMBID
-                    expectedPayload="trackmetadata"
+                    expectedPayload="recording"
                     key={`${defaultValue}-${copyTextClickCounter}`}
-                    onSelectRecording={(trackMetadata) => {
-                      setSelectedRecording(trackMetadata);
+                    onSelectRecording={(newSelectedRecording) => {
+                      setSelectedRecording(newSelectedRecording);
+                      if (newSelectedRecording.releases?.length === 1) {
+                        setSelectedRelease(newSelectedRecording.releases[0]);
+                      } else {
+                        setSelectedRelease(undefined);
+                      }
                     }}
                     defaultValue={defaultValue}
                   />
                 </div>
               )}
+              {selectedRecording && selectedRecording?.releases?.length > 1 && (
+                <>
+                  <h5
+                    data-toggle="collapse"
+                    data-target={`#collapsible-${selectedRecording.id}`}
+                    aria-controls={`collapsible-${selectedRecording.id}`}
+                    className="header-with-line collapsed"
+                    style={{
+                      gap: "5px",
+                      marginBottom: "0.5em",
+                      alignItems: "center",
+                      cursor: "pointer",
+                    }}
+                    id="select-release"
+                  >
+                    Choose from {selectedRecording?.releases?.length}{" "}
+                    releases&nbsp;
+                    <small>(optional)</small>&nbsp;
+                    <FontAwesomeIcon icon={faChevronDown} size="xs" />
+                  </h5>
+                  <div
+                    className="collapse"
+                    id={`collapsible-${selectedRecording.id}`}
+                  >
+                    <div className="help-block">
+                      Too many choices? See more details{" "}
+                      <a
+                        href={`https://musicbrainz.org/recording/${selectedRecording.id}`}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                      >
+                        on MusicBrainz
+                      </a>
+                      .
+                    </div>
+                    <div className="release-cards-grid">
+                      {selectedRecording.releases.map((release) => {
+                        const releaseGroup = release["release-group"];
+                        return (
+                          <span
+                            data-toggle="collapse"
+                            data-target={`#collapsible-${selectedRecording.id}`}
+                            key={release.id}
+                          >
+                            <ReleaseCard
+                              key={release.id}
+                              onClick={() => {
+                                setSelectedRelease(release);
+                              }}
+                              releaseName={release.title}
+                              releaseDate={release.date}
+                              dateFormatOptions={{
+                                year: "numeric",
+                                month: "short",
+                              }}
+                              releaseMBID={release.id}
+                              releaseGroupMBID={releaseGroup?.id}
+                              artistCreditName={selectedRecording[
+                                "artist-credit"
+                              ]
+                                ?.map(
+                                  (artist) =>
+                                    `${artist.name}${artist.joinphrase}`
+                                )
+                                .join("")}
+                              artistCredits={selectedRecording[
+                                "artist-credit"
+                              ].map((ac) => ({
+                                artist_credit_name: ac.name,
+                                artist_mbid: ac.artist.id,
+                                join_phrase: ac.joinphrase,
+                              }))}
+                              artistMBIDs={selectedRecording[
+                                "artist-credit"
+                              ]?.map((ac) => ac.artist.id)}
+                              releaseTypePrimary={
+                                releaseGroup?.["primary-type"]
+                              }
+                              releaseTypeSecondary={releaseGroup?.[
+                                "secondary-types"
+                              ].join("+")}
+                              caaID={null}
+                              caaReleaseMBID={release.id}
+                              showTags={false}
+                              showArtist
+                              showReleaseTitle
+                              showInformation
+                            />
+                          </span>
+                        );
+                      })}
+                    </div>
+                  </div>
+                </>
+              )}
             </div>
             <div className="modal-footer">
               <button
diff --git a/frontend/js/src/utils/APIService.ts b/frontend/js/src/utils/APIService.ts
index 323134a75e..b1f3502c00 100644
--- a/frontend/js/src/utils/APIService.ts
+++ b/frontend/js/src/utils/APIService.ts
@@ -1049,19 +1049,26 @@ export default class APIService {
   submitMBIDMapping = async (
     userToken: string,
     recordingMSID: string,
-    recordingMBID: string
+    recordingMBID: string,
+    releaseMBID?: string
   ): Promise<{ status: string }> => {
     const url = `${this.APIBaseURI}/metadata/submit_manual_mapping/`;
+    const optional: { release_mbid?: string } = {};
+    if (releaseMBID) {
+      optional.release_mbid = releaseMBID;
+    }
+    const body = {
+      recording_msid: recordingMSID,
+      recording_mbid: recordingMBID,
+      ...optional,
+    };
     const response = await fetch(url, {
       method: "POST",
       headers: {
         Authorization: `Token ${userToken}`,
         "Content-Type": "application/json;charset=UTF-8",
       },
-      body: JSON.stringify({
-        recording_msid: recordingMSID,
-        recording_mbid: recordingMBID,
-      }),
+      body: JSON.stringify(body),
     });
     await this.checkStatus(response);
     return response.json();
diff --git a/listenbrainz/db/dump.py b/listenbrainz/db/dump.py
index ca21bdc3d8..a54d5e3dcf 100644
--- a/listenbrainz/db/dump.py
+++ b/listenbrainz/db/dump.py
@@ -113,6 +113,7 @@
         'id',
         'recording_msid',
         'recording_mbid',
+        'release_mbid',
         'user_id',
         'created',
     ),
diff --git a/listenbrainz/db/mbid_manual_mapping.py b/listenbrainz/db/mbid_manual_mapping.py
index c9b6503a43..43aed4b576 100644
--- a/listenbrainz/db/mbid_manual_mapping.py
+++ b/listenbrainz/db/mbid_manual_mapping.py
@@ -11,16 +11,18 @@
 def create_mbid_manual_mapping(ts_conn, mapping: MbidManualMapping):
     """Save a user mapping to the database. """
     query = """
-        INSERT INTO mbid_manual_mapping(recording_msid, recording_mbid, user_id)
-             VALUES (:recording_msid, :recording_mbid, :user_id)
+        INSERT INTO mbid_manual_mapping(recording_msid, recording_mbid, release_mbid, user_id)
+             VALUES (:recording_msid, :recording_mbid, :release_mbid, :user_id)
         ON CONFLICT (user_id, recording_msid)
       DO UPDATE SET recording_mbid = EXCLUDED.recording_mbid
+                SET release_mbid = EXCLUDED.release_mbid
     """
     ts_conn.execute(
         text(query),
         {
             "recording_msid": mapping.recording_msid,
             "recording_mbid": mapping.recording_mbid,
+            "release_mbid": mapping.release_mbid,
             "user_id": mapping.user_id
         }
     )
@@ -41,6 +43,7 @@ def get_mbid_manual_mapping(ts_conn, recording_msid: uuid.UUID, user_id: int) ->
     query = """
         SELECT recording_msid::text
              , recording_mbid::text
+             , release_mbid::text
              , user_id
              , created
           FROM mbid_manual_mapping
@@ -59,6 +62,7 @@ def get_mbid_manual_mapping(ts_conn, recording_msid: uuid.UUID, user_id: int) ->
         return MbidManualMapping(
             recording_msid=row.recording_msid,
             recording_mbid=row.recording_mbid,
+            release_mbid=row.release_mbid,
             user_id=row.user_id,
             created=row.created
         )
@@ -79,6 +83,7 @@ def get_mbid_manual_mappings(ts_conn, recording_msid: uuid.UUID) -> List[MbidMan
     query = """
         SELECT recording_msid::text
              , recording_mbid::text
+             , release_mbid::text
              , user_id
              , created
           FROM mbid_manual_mapping
diff --git a/listenbrainz/db/model/mbid_manual_mapping.py b/listenbrainz/db/model/mbid_manual_mapping.py
index d3bc3e370a..05b7e06ba3 100644
--- a/listenbrainz/db/model/mbid_manual_mapping.py
+++ b/listenbrainz/db/model/mbid_manual_mapping.py
@@ -8,6 +8,7 @@ class MbidManualMapping(BaseModel):
     """An instance of a msid-mbid mapping manually created by a user"""
     recording_msid: str
     recording_mbid: str
+    release_mbid: Optional[str]
     user_id: int
     created: Optional[datetime.datetime]
 
@@ -15,6 +16,7 @@ def to_api(self) -> dict:
         return {
             "recording_msid": self.recording_msid,
             "recording_mbid": self.recording_mbid,
+            "recording_mbid": self.release_mbid,
             "user_id": self.user_id,
             "created": self.created
         }
diff --git a/listenbrainz/db/tests/test_mbid_manual_mapping.py b/listenbrainz/db/tests/test_mbid_manual_mapping.py
index 7e19ea7a36..9ef65f363b 100644
--- a/listenbrainz/db/tests/test_mbid_manual_mapping.py
+++ b/listenbrainz/db/tests/test_mbid_manual_mapping.py
@@ -22,6 +22,22 @@ def test_add_get_mapping(self):
         assert new_mapping.recording_msid == mapping.recording_msid
         assert new_mapping.user_id == mapping.user_id
 
+    def test_optional_release_mbid(self):
+        """Add and get a mapping with release_mbid"""
+        msid = "597fa2f2-8cf4-4566-a307-dbfb5aa35ec4"
+        mbid = "c8d63620-ced3-4abf-84f8-85457ce798c6"
+        release_mbid = "cb24f4bb-3ecf-44c7-bba9-5241faac3cef"
+        user_id = 1
+
+        mapping = MbidManualMapping(recording_msid=msid, recording_mbid=mbid, release_mbid=release_mbid, user_id=user_id)
+        db_mbid_manual_mapping.create_mbid_manual_mapping(self.ts_conn, mapping)
+
+        new_mapping = db_mbid_manual_mapping.get_mbid_manual_mapping(self.ts_conn, msid, user_id)
+        assert new_mapping.recording_mbid == mapping.recording_mbid
+        assert new_mapping.recording_msid == mapping.recording_msid
+        assert new_mapping.release_mbid == mapping.release_mbid
+        assert new_mapping.user_id == mapping.user_id
+
     def test_cant_add_same_mapping_twice(self):
         """Try and add the same mapping by the same user twice, it gets updated"""
         msid = "597fa2f2-8cf4-4566-a307-dbfb5aa35ec4"
diff --git a/listenbrainz/webserver/views/metadata_api.py b/listenbrainz/webserver/views/metadata_api.py
index 3d237d1a64..133f45e0de 100644
--- a/listenbrainz/webserver/views/metadata_api.py
+++ b/listenbrainz/webserver/views/metadata_api.py
@@ -464,6 +464,7 @@ def submit_manual_mapping():
 
     recording_msid = request.json.get("recording_msid")
     recording_mbid = request.json.get("recording_mbid")
+    release_mbid = request.json.get("release_mbid")
     if not recording_msid or not is_valid_uuid(recording_msid):
         raise APIBadRequest("recording_msid is invalid or not present in arguments")
     if not recording_mbid or not is_valid_uuid(recording_mbid):
@@ -472,6 +473,7 @@ def submit_manual_mapping():
     mapping = MbidManualMapping(
         recording_msid=recording_msid,
         recording_mbid=recording_mbid,
+        release_mbid=release_mbid,
         user_id=user["id"]
     )