diff --git a/app/Models/EntityModel.php b/app/Models/EntityModel.php
index 756f1d982841..b86cc4c9de33 100644
--- a/app/Models/EntityModel.php
+++ b/app/Models/EntityModel.php
@@ -397,6 +397,13 @@ class EntityModel extends Eloquent
                 $nextId = static::getNextPublicId($this->account_id);
                 if ($nextId != $this->public_id) {
                     $this->public_id = $nextId;
+                    if (env('MULTI_DB_ENABLED')) {
+                        if ($this->contact_key) {
+                            $this->contact_key = strtolower(str_random(RANDOM_KEY_LENGTH));
+                        } elseif ($this->invitation_key) {
+                            $this->invitation_key = strtolower(str_random(RANDOM_KEY_LENGTH));
+                        }
+                    }
                     return $this->save($options);
                 }
             }