diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
index 8e4aa87c01..2f6cd53383 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
@@ -87,7 +87,7 @@
                                         <td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => cr.item.ccode, opac => 1 ) | html %]</td>
                                         <td>[% cr.item.itemcallnumber | html %]</td>
                                         <td>[% cr.item.copynumber | html %]</td>
-                                        <td>[% INCLUDE 'item-status.inc' item=cr.course_item issue=cr.issue show_recall_link=1 %]</td>
+                                        <td>[% INCLUDE 'item-status.inc' item=cr.item issue=cr.issue show_recall_link=Koha.Preference('UseRecalls') %]</td>
                                         <td data-order="[% cr.issue.date_due | html %]">[% cr.issue.date_due | $KohaDates  as_due_date => 1 %]</td>
                                         <td>[% IF ( cr.public_note ) %]
                                                 [% cr.public_note | $raw %]
diff --git a/opac/opac-course-details.pl b/opac/opac-course-details.pl
index 6154549c06..415cade52f 100755
--- a/opac/opac-course-details.pl
+++ b/opac/opac-course-details.pl
@@ -44,12 +44,6 @@ die("No course_id given") unless ($course_id);
 my $course = GetCourse($course_id);
 my $course_reserves = GetCourseReserves( course_id => $course_id, include_items => 1, include_count => 1 );
 
-if ( C4::Context->preference('UseRecalls') ) {
-    foreach my $cr ( @$course_reserves ) {
-        $cr->{course_item} = Koha::Items->find($cr->{itemnumber});
-    }
-}
-
 $template->param(
     course          => $course,
     course_reserves => $course_reserves,