diff --git a/lib/MusicBrainz/Server/Controller/CDTOC.pm b/lib/MusicBrainz/Server/Controller/CDTOC.pm
index 2705f826ee7..072d2ce8e90 100644
--- a/lib/MusicBrainz/Server/Controller/CDTOC.pm
+++ b/lib/MusicBrainz/Server/Controller/CDTOC.pm
@@ -80,6 +80,11 @@ sub remove : Local Edit
     $c->model('ReleaseGroup')->load($release);
     $c->model('ReleaseGroup')->load_meta($release->release_group);
 
+    # For proper display of the Disc IDs tab
+    $c->model('Medium')->load_for_releases($release);
+    my $cdtoc_count = $c->model('MediumCDTOC')->find_count_by_release($release->id);
+    $c->stash->{release_cdtoc_count} = $cdtoc_count;
+
     my $cdtoc = $c->model('MediumCDTOC')->get_by_medium_cdtoc($medium_id, $cdtoc_id);
     $c->model('CDTOC')->load($cdtoc);
 
diff --git a/root/cdtoc/remove.tt b/root/cdtoc/remove.tt
index 202a8f24458..dcd33d917dd 100644
--- a/root/cdtoc/remove.tt
+++ b/root/cdtoc/remove.tt
@@ -4,7 +4,7 @@
       <li>
         [% l('Are you sure you want to remove the disc ID <code>{discid}</code> from the release
               {release} by {artist}?',
-             { discid => medium_cdtoc.cdtoc.discid, release => link_entity(release),
+             { discid => link_cdtoc(medium_cdtoc.cdtoc), release => link_entity(release),
                artist => artist_credit(release.artist_credit) }) %]
       </li>
       <li>