diff --git a/Koha/ApiKey.pm b/Koha/ApiKey.pm
index 08b661be02..716dd0efc2 100644
--- a/Koha/ApiKey.pm
+++ b/Koha/ApiKey.pm
@@ -49,8 +49,10 @@ sub store {
 
     my ( $uuid, $uuidstring );
 
-    $self->client_id($self->_generate_unused_uuid('client_id'));
-    $self->secret($self->_generate_unused_uuid('secret'));
+    $self->client_id($self->_generate_unused_uuid('client_id'))
+        unless $self->client_id;
+    $self->secret($self->_generate_unused_uuid('secret'))
+        unless $self->secret;
 
     return $self->SUPER::store();
 }