diff --git a/app/actions/websocket/teams.test.ts b/app/actions/websocket/teams.test.ts
new file mode 100644
index 000000000..652f115c2
--- /dev/null
+++ b/app/actions/websocket/teams.test.ts
@@ -0,0 +1,345 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {removeUserFromTeam} from '@actions/local/team';
+import {fetchMyChannelsForTeam} from '@actions/remote/channel';
+import {fetchRoles} from '@actions/remote/role';
+import {fetchMyTeam, updateCanJoinTeams} from '@actions/remote/team';
+import {updateUsersNoLongerVisible} from '@actions/remote/user';
+import {handleTeamArchived, handleTeamRestored, handleLeaveTeamEvent, handleUpdateTeamEvent, handleUserAddedToTeamEvent} from '@actions/websocket/teams';
+import DatabaseManager from '@database/manager';
+import NetworkManager from '@managers/network_manager';
+import {getCurrentTeam, queryMyTeamsByIds} from '@queries/servers/team';
+import {getCurrentUser} from '@queries/servers/user';
+import EphemeralStore from '@store/ephemeral_store';
+import {setTeamLoading} from '@store/team_load_store';
+import {logDebug} from '@utils/log';
+
+import type ServerDataOperator from '@database/operator/server_data_operator';
+import type TeamModel from '@typings/database/models/servers/team';
+import type UserModel from '@typings/database/models/servers/user';
+
+jest.mock('@actions/local/team', () => ({
+    removeUserFromTeam: jest.fn(),
+}));
+
+jest.mock('@actions/remote/channel', () => ({
+    fetchMyChannelsForTeam: jest.fn(),
+}));
+
+jest.mock('@actions/remote/role', () => ({
+    fetchRoles: jest.fn(),
+}));
+
+jest.mock('@actions/remote/team', () => ({
+    fetchMyTeam: jest.fn(),
+    handleKickFromTeam: jest.fn(),
+    updateCanJoinTeams: jest.fn(),
+}));
+
+jest.mock('@actions/remote/user', () => ({
+    updateUsersNoLongerVisible: jest.fn(),
+}));
+
+jest.mock('@managers/network_manager', () => ({
+    getClient: jest.fn(),
+}));
+
+jest.mock('@queries/servers/team', () => ({
+    ...jest.requireActual('@queries/servers/team'),
+    getCurrentTeam: jest.fn(),
+    queryMyTeamsByIds: jest.fn(),
+}));
+
+jest.mock('@queries/servers/user', () => ({
+    getCurrentUser: jest.fn(),
+}));
+
+jest.mock('@store/ephemeral_store', () => ({
+    isAddingToTeam: jest.fn(),
+    startAddingToTeam: jest.fn(),
+    finishAddingToTeam: jest.fn(),
+}));
+
+jest.mock('@store/team_load_store', () => ({
+    setTeamLoading: jest.fn(),
+}));
+
+jest.mock('@utils/errors', () => ({
+    getFullErrorMessage: jest.fn(),
+}));
+
+jest.mock('@utils/log', () => ({
+    ...jest.requireActual('@utils/log'),
+    logDebug: jest.fn(),
+}));
+
+describe('WebSocket Team Actions', () => {
+    const serverUrl = 'https://example.com';
+    let operator: ServerDataOperator;
+
+    const mockedLogDebug = jest.mocked(logDebug);
+
+    beforeEach(async () => {
+        await DatabaseManager.init([serverUrl]);
+        operator = DatabaseManager.serverDatabases[serverUrl]!.operator;
+        DatabaseManager.getActiveServerUrl = jest.fn().mockResolvedValue(serverUrl);
+    });
+
+    afterEach(async () => {
+        await DatabaseManager.destroyServerDatabase(serverUrl);
+        jest.restoreAllMocks();
+    });
+
+    describe('handleTeamArchived', () => {
+        const msg = {data: {team: JSON.stringify({id: 'team1'})}} as WebSocketMessage;
+
+        it('should handle team archived event', async () => {
+            const mockedQueryMyTeamsByIds = jest.mocked(queryMyTeamsByIds);
+            const mockedGetCurrentTeam = jest.mocked(getCurrentTeam);
+            const mockedRemoveUserFromTeam = jest.mocked(removeUserFromTeam);
+            const mockedGetCurrentUser = jest.mocked(getCurrentUser);
+            const mockedUpdateUsersNoLongerVisible = jest.mocked(updateUsersNoLongerVisible);
+            const mockedUpdateCanJoinTeams = jest.mocked(updateCanJoinTeams);
+
+            mockedQueryMyTeamsByIds.mockReturnValue({fetch: jest.fn().mockResolvedValue([{id: 'team1'}])} as any);
+            mockedGetCurrentTeam.mockResolvedValue({id: 'team1'} as TeamModel);
+            mockedRemoveUserFromTeam.mockResolvedValue({error: undefined});
+            mockedGetCurrentUser.mockResolvedValue({id: 'user1', isGuest: true} as UserModel);
+            mockedUpdateUsersNoLongerVisible.mockResolvedValue({error: undefined});
+            mockedUpdateCanJoinTeams.mockResolvedValue({error: undefined});
+
+            await handleTeamArchived(serverUrl, msg);
+
+            expect(mockedRemoveUserFromTeam).toHaveBeenCalledWith(serverUrl, 'team1');
+            expect(mockedUpdateUsersNoLongerVisible).toHaveBeenCalledWith(serverUrl);
+            expect(mockedUpdateCanJoinTeams).toHaveBeenCalledWith(serverUrl);
+        });
+
+        it('should handle team archived event - no membership', async () => {
+            const mockedQueryMyTeamsByIds = jest.mocked(queryMyTeamsByIds);
+            const mockedUpdateCanJoinTeams = jest.mocked(updateCanJoinTeams);
+            const mockedRemoveUserFromTeam = jest.mocked(removeUserFromTeam);
+
+            mockedQueryMyTeamsByIds.mockReturnValue({fetch: jest.fn().mockResolvedValue([undefined])} as any);
+            mockedUpdateCanJoinTeams.mockResolvedValue({error: undefined});
+
+            await handleTeamArchived(serverUrl, msg);
+
+            expect(mockedRemoveUserFromTeam).not.toHaveBeenCalled();
+            expect(mockedUpdateCanJoinTeams).toHaveBeenCalledWith(serverUrl);
+        });
+
+        it('should handle team archived event - not guest, not current team', async () => {
+            const mockedQueryMyTeamsByIds = jest.mocked(queryMyTeamsByIds);
+            const mockedGetCurrentTeam = jest.mocked(getCurrentTeam);
+            const mockedRemoveUserFromTeam = jest.mocked(removeUserFromTeam);
+            const mockedGetCurrentUser = jest.mocked(getCurrentUser);
+            const mockedUpdateUsersNoLongerVisible = jest.mocked(updateUsersNoLongerVisible);
+            const mockedUpdateCanJoinTeams = jest.mocked(updateCanJoinTeams);
+
+            mockedQueryMyTeamsByIds.mockReturnValue({fetch: jest.fn().mockResolvedValue([{id: 'team1'}])} as any);
+            mockedGetCurrentTeam.mockResolvedValue({id: 'team2'} as TeamModel);
+            mockedRemoveUserFromTeam.mockResolvedValue({error: undefined});
+            mockedGetCurrentUser.mockResolvedValue({id: 'user1', isGuest: false} as UserModel);
+            mockedUpdateCanJoinTeams.mockResolvedValue({error: undefined});
+
+            await handleTeamArchived(serverUrl, msg);
+
+            expect(mockedRemoveUserFromTeam).toHaveBeenCalledWith(serverUrl, 'team1');
+            expect(mockedUpdateUsersNoLongerVisible).not.toHaveBeenCalled();
+            expect(mockedUpdateCanJoinTeams).toHaveBeenCalledWith(serverUrl);
+        });
+
+        it('should log error if an exception occurs', async () => {
+            const mockedGetServerDatabaseAndOperator = jest.spyOn(DatabaseManager, 'getServerDatabaseAndOperator');
+
+            mockedGetServerDatabaseAndOperator.mockImplementation(() => {
+                throw new Error('Test error');
+            });
+
+            await handleTeamArchived(serverUrl, msg);
+
+            expect(mockedLogDebug).toHaveBeenCalledWith('cannot handle archive team websocket event', expect.any(Error));
+        });
+    });
+
+    describe('handleTeamRestored', () => {
+        const msg = {data: {team: JSON.stringify({id: 'team1'})}} as WebSocketMessage;
+
+        it('should handle team restored event', async () => {
+            const client = {getTeamMember: jest.fn().mockResolvedValue({delete_at: 0})};
+            const mockedGetClient = jest.mocked(NetworkManager.getClient);
+            const mockedIsAddingToTeam = jest.mocked(EphemeralStore.isAddingToTeam);
+            const mockedSetTeamLoading = jest.mocked(setTeamLoading);
+            const mockedFinishAddingToTeam = jest.mocked(EphemeralStore.finishAddingToTeam);
+            const mockedUpdateCanJoinTeams = jest.mocked(updateCanJoinTeams);
+            const mockedFetchMyChannelsForTeam = jest.mocked(fetchMyChannelsForTeam);
+            const mockedFetchRoles = jest.mocked(fetchRoles);
+            jest.spyOn(operator, 'batchRecords').mockResolvedValueOnce();
+            jest.spyOn(operator, 'handleRole').mockResolvedValueOnce([]);
+
+            mockedGetClient.mockReturnValue(client as any);
+            mockedIsAddingToTeam.mockReturnValue(false);
+            mockedFetchMyChannelsForTeam.mockResolvedValue({channels: [], memberships: [], categories: []});
+            mockedFetchRoles.mockResolvedValue({roles: [{id: 'role1', name: 'role1', permissions: []}]});
+
+            await handleTeamRestored(serverUrl, msg);
+
+            expect(mockedSetTeamLoading).toHaveBeenCalledWith(serverUrl, true);
+            expect(mockedSetTeamLoading).toHaveBeenCalledWith(serverUrl, false);
+            expect(mockedFinishAddingToTeam).toHaveBeenCalledWith('team1');
+            expect(mockedUpdateCanJoinTeams).toHaveBeenCalledWith(serverUrl);
+            expect(operator.batchRecords).toHaveBeenCalled();
+        });
+
+        it('should log error if an exception occurs', async () => {
+            const mockedGetClient = jest.mocked(NetworkManager.getClient);
+
+            mockedGetClient.mockImplementationOnce(() => {
+                throw new Error('Test error');
+            });
+
+            await handleTeamRestored(serverUrl, msg);
+
+            expect(mockedLogDebug).toHaveBeenCalledWith('cannot handle restore team websocket event', undefined);
+        });
+    });
+
+    describe('handleLeaveTeamEvent', () => {
+        const msg = {data: {user_id: 'user1', team_id: 'team1'}} as WebSocketMessage;
+
+        it('should handle leave team event', async () => {
+            const mockedGetCurrentUser = jest.mocked(getCurrentUser);
+            const mockedGetCurrentTeam = jest.mocked(getCurrentTeam);
+            const mockedRemoveUserFromTeam = jest.mocked(removeUserFromTeam);
+
+            mockedGetCurrentUser.mockResolvedValue({id: 'user1', isGuest: true} as UserModel);
+            mockedGetCurrentTeam.mockResolvedValue({id: 'team1'} as TeamModel);
+
+            await handleLeaveTeamEvent(serverUrl, msg);
+
+            expect(mockedRemoveUserFromTeam).toHaveBeenCalledWith(serverUrl, 'team1');
+        });
+
+        it('should handle leave team event - not current user', async () => {
+            const mockedGetCurrentUser = jest.mocked(getCurrentUser);
+            const mockedRemoveUserFromTeam = jest.mocked(removeUserFromTeam);
+
+            mockedGetCurrentUser.mockResolvedValue({id: 'user2', isGuest: true} as UserModel);
+
+            await handleLeaveTeamEvent(serverUrl, msg);
+
+            expect(mockedRemoveUserFromTeam).not.toHaveBeenCalled();
+        });
+
+        it('should handle leave team event - not user', async () => {
+            const mockedGetCurrentUser = jest.mocked(getCurrentUser);
+            const mockedRemoveUserFromTeam = jest.mocked(removeUserFromTeam);
+
+            mockedGetCurrentUser.mockResolvedValue(undefined);
+
+            await handleLeaveTeamEvent(serverUrl, msg);
+
+            expect(mockedRemoveUserFromTeam).not.toHaveBeenCalled();
+        });
+
+        it('should handle leave team event - not guest, not current team', async () => {
+            const mockedGetCurrentUser = jest.mocked(getCurrentUser);
+            const mockedGetCurrentTeam = jest.mocked(getCurrentTeam);
+            const mockedRemoveUserFromTeam = jest.mocked(removeUserFromTeam);
+
+            mockedGetCurrentUser.mockResolvedValue({id: 'user1', isGuest: false} as UserModel);
+            mockedGetCurrentTeam.mockResolvedValue({id: 'team2'} as TeamModel);
+
+            await handleLeaveTeamEvent(serverUrl, msg);
+
+            expect(mockedRemoveUserFromTeam).toHaveBeenCalledWith(serverUrl, 'team1');
+        });
+
+        it('should log error if an exception occurs', async () => {
+            const mockedGetServerDatabaseAndOperator = jest.spyOn(DatabaseManager, 'getServerDatabaseAndOperator');
+
+            mockedGetServerDatabaseAndOperator.mockImplementation(() => {
+                throw new Error('Test error');
+            });
+
+            await handleLeaveTeamEvent(serverUrl, msg);
+
+            expect(mockedLogDebug).toHaveBeenCalledWith('cannot handle leave team websocket event', expect.any(Error));
+        });
+    });
+
+    describe('handleUpdateTeamEvent', () => {
+        const msg = {data: {team: JSON.stringify({id: 'team1'})}} as WebSocketMessage;
+
+        it('should handle update team event', async () => {
+            const mockedHandleTeam = jest.spyOn(operator, 'handleTeam');
+
+            await handleUpdateTeamEvent(serverUrl, msg);
+
+            expect(mockedHandleTeam).toHaveBeenCalledWith({
+                teams: [{id: 'team1'}],
+                prepareRecordsOnly: false,
+            });
+        });
+
+        it('should do nothing if an exception occurs', async () => {
+            const mockedGetServerDatabaseAndOperator = jest.spyOn(DatabaseManager, 'getServerDatabaseAndOperator');
+            const mockedHandleTeam = jest.spyOn(operator, 'handleTeam');
+
+            mockedGetServerDatabaseAndOperator.mockImplementation(() => {
+                throw new Error('Test error');
+            });
+
+            await handleUpdateTeamEvent(serverUrl, msg);
+
+            expect(mockedHandleTeam).not.toHaveBeenCalled();
+        });
+    });
+
+    describe('handleUserAddedToTeamEvent', () => {
+        const msg = {data: {team_id: 'team1'}} as WebSocketMessage;
+
+        it('should handle user added to team event', async () => {
+            const mockedIsAddingToTeam = jest.mocked(EphemeralStore.isAddingToTeam);
+            const mockedSetTeamLoading = jest.mocked(setTeamLoading);
+            const mockedFinishAddingToTeam = jest.mocked(EphemeralStore.finishAddingToTeam);
+            const mockedFetchMyTeam = jest.mocked(fetchMyTeam);
+
+            mockedIsAddingToTeam.mockReturnValue(false);
+            mockedFetchMyTeam.mockResolvedValue({teams: [], memberships: []});
+
+            await handleUserAddedToTeamEvent(serverUrl, msg);
+
+            expect(mockedSetTeamLoading).toHaveBeenCalledWith(serverUrl, true);
+            expect(mockedSetTeamLoading).toHaveBeenCalledWith(serverUrl, false);
+            expect(mockedFinishAddingToTeam).toHaveBeenCalledWith('team1');
+        });
+
+        it('should handle user added to team event - already adding', async () => {
+            const mockedIsAddingToTeam = jest.mocked(EphemeralStore.isAddingToTeam);
+            const mockedFinishAddingToTeam = jest.mocked(EphemeralStore.finishAddingToTeam);
+
+            mockedIsAddingToTeam.mockReturnValue(true);
+
+            await handleUserAddedToTeamEvent(serverUrl, msg);
+
+            expect(mockedFinishAddingToTeam).not.toHaveBeenCalled();
+        });
+
+        it('should log error if an exception occurs', async () => {
+            const mockedGetServerDatabaseAndOperator = jest.spyOn(DatabaseManager, 'getServerDatabaseAndOperator');
+            const mockedIsAddingToTeam = jest.mocked(EphemeralStore.isAddingToTeam);
+
+            mockedIsAddingToTeam.mockReturnValue(false);
+            mockedGetServerDatabaseAndOperator.mockImplementation(() => {
+                throw new Error('Test error');
+            });
+
+            await handleUserAddedToTeamEvent(serverUrl, msg);
+
+            expect(mockedLogDebug).toHaveBeenCalledWith('could not handle user added to team websocket event');
+        });
+    });
+});