diff --git a/C4/Record.pm b/C4/Record.pm
index 33d18b86bd..799499ec86 100644
--- a/C4/Record.pm
+++ b/C4/Record.pm
@@ -592,20 +592,26 @@ sub marcrecord2csv {
 
                 # Or a field
                 } else {
-                    my $authvalues = Koha::AuthorisedValues->get_descriptions_by_marc_field(
-                        { frameworkcode => $frameworkcode, tagfield => $tag->{fieldtag}, } );
 
                     foreach my $field ( @fields ) {
                         my $value;
 
                         # If it is a control field
                         if ($field->is_control_field) {
+                            my $authvalues = Koha::AuthorisedValues->get_descriptions_by_marc_field(
+                                { frameworkcode => $frameworkcode, tagfield => $tag->{fieldtag}, } );
                             $value = defined $authvalues->{$field->as_string} ? $authvalues->{$field->as_string} : $field->as_string;
                         } else {
                             # If it is a field, we gather all subfields, joined by the subfield separator
                             my @subvaluesarray;
                             my @subfields = $field->subfields;
                             foreach my $subfield (@subfields) {
+                                my $authvalues = Koha::AuthorisedValues->get_descriptions_by_marc_field(
+                                    {
+                                        frameworkcode => $frameworkcode, tagfield => $tag->{fieldtag},
+                                        tagsubfield   => $subfield->[0],
+                                    }
+                                );
                                 push (@subvaluesarray, defined $authvalues->{$subfield->[1]} ? $authvalues->{$subfield->[1]} : $subfield->[1]);
                             }
                             $value = join ($subfieldseparator, @subvaluesarray);
diff --git a/t/db_dependent/AuthorisedValues.t b/t/db_dependent/AuthorisedValues.t
index f4f57d1974..83332ac79b 100755
--- a/t/db_dependent/AuthorisedValues.t
+++ b/t/db_dependent/AuthorisedValues.t
@@ -156,17 +156,23 @@ subtest 'search_by_*_field + find_by_koha_field + get_description + authorised_v
     $mss->delete if $mss;
     $mss = Koha::MarcSubfieldStructures->search( { tagfield => 952, tagsubfield => '5', frameworkcode => '' } );
     $mss->delete if $mss;
+    $mss = Koha::MarcSubfieldStructures->search( { tagfield => '003', frameworkcode => '' } );
+    $mss->delete if $mss;
     Koha::AuthorisedValueCategory->new( { category_name => 'TEST' } )->store;
+    Koha::AuthorisedValueCategory->new( { category_name => 'CONTROL_TEST' } )->store;
     Koha::AuthorisedValueCategory->new( { category_name => 'ANOTHER_4_TESTS' } )->store;
     Koha::MarcSubfieldStructure->new( { tagfield => 952, tagsubfield => 'c', frameworkcode => '', authorised_value => 'TEST', kohafield => 'items.location' } )->store;
     Koha::MarcSubfieldStructure->new( { tagfield => 952, tagsubfield => 'c', frameworkcode => 'ACQ', authorised_value => 'TEST', kohafield => 'items.location' } )->store;
     Koha::MarcSubfieldStructure->new( { tagfield => 952, tagsubfield => 'd', frameworkcode => '', authorised_value => 'ANOTHER_4_TESTS', kohafield => 'items.another_field' } )->store;
     Koha::MarcSubfieldStructure->new( { tagfield => 952, tagsubfield => '5', frameworkcode => '', authorised_value => 'restricted_for_testing', kohafield => 'items.restricted' } )->store;
+    Koha::MarcSubfieldStructure->new( { tagfield => '003', frameworkcode => '', authorised_value => 'CONTROL_TEST', } )->store;
     Koha::AuthorisedValue->new( { category => 'TEST', authorised_value => 'location_1', lib => 'location_1' } )->store;
     Koha::AuthorisedValue->new( { category => 'TEST', authorised_value => 'location_2', lib => 'location_2' } )->store;
     Koha::AuthorisedValue->new( { category => 'TEST', authorised_value => 'location_3', lib => 'location_3' } )->store;
     Koha::AuthorisedValue->new( { category => 'ANOTHER_4_TESTS', authorised_value => 'an_av' } )->store;
     Koha::AuthorisedValue->new( { category => 'ANOTHER_4_TESTS', authorised_value => 'another_av' } )->store;
+    Koha::AuthorisedValue->new( { category => 'CONTROL_TEST', authorised_value => 'lib1', lib => 'lib1' } )->store;
+    Koha::AuthorisedValue->new( { category => 'CONTROL_TEST', authorised_value => 'lib2', lib => 'lib2' } )->store;
     subtest 'search_by_marc_field' => sub {
         plan tests => 4;
         my $avs;
@@ -254,7 +260,23 @@ subtest 'search_by_*_field + find_by_koha_field + get_description + authorised_v
     };
 
     subtest 'get_descriptions_by_marc_field' => sub {
-        plan tests => 1;
+        plan tests => 4;
+
+        my $control_descriptions = Koha::AuthorisedValues->get_descriptions_by_marc_field(
+            { frameworkcode => '', tagfield => '003', } );
+        is_deeply(
+            $control_descriptions,
+            {
+                'lib1' => 'lib1',
+                'lib2' => 'lib2',
+            },
+        );
+
+        my $control_descriptions_cached = Koha::AuthorisedValues->get_descriptions_by_marc_field(
+            { frameworkcode => '', tagfield => '003', } );
+
+        is("$control_descriptions","$control_descriptions_cached","Same memory address used proves cached control desc data");
+
         my $descriptions = Koha::AuthorisedValues->get_descriptions_by_marc_field(
             { frameworkcode => '', tagfield => '952', tagsubfield => 'c' } );
         is_deeply(
@@ -265,6 +287,10 @@ subtest 'search_by_*_field + find_by_koha_field + get_description + authorised_v
                 'location_3' => 'location_3',
             },
         );
+
+        my $descriptions_cached = Koha::AuthorisedValues->get_descriptions_by_marc_field(
+            { frameworkcode => '', tagfield => '952', tagsubfield => 'c' } );
+        is("$descriptions","$descriptions_cached","Same memory address used proves cached desc data");
     };
 
     subtest 'authorised_values' => sub {