diff --git a/ts/receiver/libsession/handleLibSessionMessage.ts b/ts/receiver/libsession/handleLibSessionMessage.ts
index b24c06ea9..4e862f968 100644
--- a/ts/receiver/libsession/handleLibSessionMessage.ts
+++ b/ts/receiver/libsession/handleLibSessionMessage.ts
@@ -1,15 +1,15 @@
 import { EncryptionDomain, GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs';
 import { isNumber, toNumber } from 'lodash';
+import { ConvoHub } from '../../session/conversations';
 import { LibSodiumWrappers } from '../../session/crypto';
 import { PubKey } from '../../session/types';
+import { WithLibSodiuMWrappers } from '../../session/types/with';
 import { DecryptionFailed, InvalidMessage } from '../../session/utils/errors';
 import { assertUnreachable } from '../../types/sqlSharedTypes';
-import { WithLibSodiuMWrappers } from '../../session/types/with';
 import {
   MetaGroupWrapperActions,
   UserGroupsWrapperActions,
 } from '../../webworker/workers/browser/libsession_worker_interface';
-import { ConvoHub } from '../../session/conversations';
 
 /**
  * Logic for handling the `groupKicked` `LibSessionMessage`, this message should only be processed if it was
@@ -48,8 +48,10 @@ async function handleLibSessionKickedMessage({
   if (currentGenEmbedded < currentGenFromWrapper) {
     throw new InvalidMessage('currentgen in wrapper is higher than the one in the message ');
   }
-  const inviteWasPending =
-    (await UserGroupsWrapperActions.getGroup(groupPk))?.invitePending || false;
+
+  const groupInUserGroup = await UserGroupsWrapperActions.getGroup(groupPk);
+  const inviteWasPending = groupInUserGroup?.invitePending || false;
+
   await ConvoHub.use().deleteGroup(groupPk, {
     sendLeaveMessage: false,
     fromSyncMessage: false,
diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts
index 1006355f9..b2c15c5b2 100644
--- a/ts/session/conversations/ConversationController.ts
+++ b/ts/session/conversations/ConversationController.ts
@@ -280,11 +280,11 @@ class ConvoController {
     // we don't need to keep polling anymore.
     getSwarmPollingInstance().removePubkey(groupPk, 'deleteGroup');
 
-    const group = await UserGroupsWrapperActions.getGroup(groupPk);
+    const groupInUserGroup = await UserGroupsWrapperActions.getGroup(groupPk);
 
     // send the leave message before we delete everything for this group (including the key!)
     // Note: if we were kicked, we already lost the authdata/secretKey for it, so no need to try to send our message.
-    if (sendLeaveMessage && !group?.kicked) {
+    if (sendLeaveMessage && !groupInUserGroup?.kicked) {
       await leaveClosedGroup(groupPk, fromSyncMessage);
     }
     // a group 03 can be removed fully or kept empty as kicked.
@@ -293,12 +293,26 @@ class ConvoController {
     // Note: the pendingInvite=true case cannot really happen as we wouldn't be polling from that group (and so, not get the message kicking us)
     if (emptyGroupButKeepAsKicked) {
       // delete the secretKey/authData if we had it. If we need it for something, it has to be done before this call.
-      if (group) {
-        group.authData = null;
-        group.secretKey = null;
-        group.disappearingTimerSeconds = undefined;
-        group.kicked = true;
-        await UserGroupsWrapperActions.setGroup(group);
+      if (groupInUserGroup) {
+        groupInUserGroup.authData = null;
+        groupInUserGroup.secretKey = null;
+        groupInUserGroup.disappearingTimerSeconds = undefined;
+        groupInUserGroup.kicked = true;
+        // we want to update the groupName in usergroup with whatever is in the groupInfo,
+        // so even if the group is not polled anymore, we have an up to date name on restore.
+        let nameInMetagroup: string | undefined;
+        try {
+          const metagroup = await MetaGroupWrapperActions.infoGet(groupPk);
+          if (metagroup && metagroup.name && !isEmpty(metagroup.name)) {
+            nameInMetagroup = metagroup.name;
+          }
+        } catch (e) {
+          // nothing to do
+        }
+        if (groupInUserGroup && nameInMetagroup && groupInUserGroup.name !== nameInMetagroup) {
+          groupInUserGroup.name = nameInMetagroup;
+        }
+        await UserGroupsWrapperActions.setGroup(groupInUserGroup);
       }
     } else {
       try {