diff --git a/t/db_dependent/Koha/Object.t b/t/db_dependent/Koha/Object.t
index 64d3f1d9ea..a1e10e846a 100755
--- a/t/db_dependent/Koha/Object.t
+++ b/t/db_dependent/Koha/Object.t
@@ -390,7 +390,7 @@ subtest "to_api_mapping() tests" => sub {
 
 subtest "from_api_mapping() tests" => sub {
 
-    plan tests => 3;
+    plan tests => 5;
 
     $schema->storage->txn_begin;
 
@@ -449,6 +449,28 @@ subtest "from_api_mapping() tests" => sub {
         'Fresh mapping loaded'
     );
 
+    $city_class->unmock( 'to_api_mapping');
+    $city_class->mock( 'to_api_mapping', undef );
+
+    # Get a fresh object
+    $city = $builder->build_object({ class => 'Koha::Cities' });
+    is_deeply(
+        $city->from_api_mapping,
+        {},
+        'No to_api_mapping then empty hashref'
+    );
+
+    $city_class->unmock( 'to_api_mapping');
+    $city_class->mock( 'to_api_mapping', sub { return; } );
+
+    # Get a fresh object
+    $city = $builder->build_object({ class => 'Koha::Cities' });
+    is_deeply(
+        $city->from_api_mapping,
+        {},
+        'Empty to_api_mapping then empty hashref'
+    );
+
     $schema->storage->txn_rollback;
 };