diff --git a/lib/process-services-cloud/src/lib/services/web-socket.service.spec.ts b/lib/process-services-cloud/src/lib/services/web-socket.service.spec.ts
index b89a0f629a8..a8cbbfdc7f4 100644
--- a/lib/process-services-cloud/src/lib/services/web-socket.service.spec.ts
+++ b/lib/process-services-cloud/src/lib/services/web-socket.service.spec.ts
@@ -27,7 +27,7 @@ describe('WebSocketService', () => {
     let service: WebSocketService;
     const onLogoutSubject: Subject<void> = new Subject<void>();
 
-    const apolloMock = jasmine.createSpyObj('Apollo', ['use', 'createNamed']);
+    const apolloMock = jasmine.createSpyObj('Apollo', ['use', 'createNamed', 'removeClient']);
 
     beforeEach(() => {
         TestBed.configureTestingModule({
diff --git a/lib/process-services-cloud/src/lib/services/web-socket.service.ts b/lib/process-services-cloud/src/lib/services/web-socket.service.ts
index f84ac9ef5f0..e85afc3324c 100644
--- a/lib/process-services-cloud/src/lib/services/web-socket.service.ts
+++ b/lib/process-services-cloud/src/lib/services/web-socket.service.ts
@@ -72,6 +72,12 @@ export class WebSocketService {
         return this.apollo.use(apolloClientName).subscribe<T>({ errorPolicy: 'all', ...subscriptionOptions });
     }
 
+    private removeApolloClientIfExists(apolloClientName: string) {
+        if (this.apollo.use(apolloClientName)) {
+            this.apollo.removeClient(apolloClientName);
+        }
+    }
+
     private get contextRoot() {
         return this.appConfigService.get('bpmHost', '');
     }
@@ -135,9 +141,25 @@ export class WebSocketService {
                 max: Number.POSITIVE_INFINITY,
                 jitter: true
             },
-            attempts: {
-                max: 5,
-                retryIf: (error) => !!error
+            attempts: (count: number, _operation: Operation, error: any) => {
+                if (!error) {
+                    return false;
+                }
+
+                const isUnauthorizedError =
+                    (Array.isArray(error) &&
+                        error.some(
+                            (err: any) =>
+                                err?.extensions?.code === 'UNAUTHORIZED' ||
+                                err?.message?.includes('4401') ||
+                                err?.message?.toLowerCase().includes('unauthorized')
+                        )) ||
+                    (typeof error === 'string' && (error.includes('4401') || error.toLowerCase().includes('unauthorized'))) ||
+                    (error?.message && (error.message.includes('4401') || error.message.toLowerCase().includes('unauthorized')));
+
+                const shouldRetry = isUnauthorizedError ? this.authService.isLoggedIn() : count < 5;
+
+                return shouldRetry;
             }
         });
 
@@ -155,10 +177,13 @@ export class WebSocketService {
         this.wsLink = new GraphQLWsLink(
             createClient({
                 url: this.createWsUrl(options.wsUrl) + '/v2/ws/graphql',
-                connectionParams: {
+                connectionParams: () => ({
                     Authorization: 'Bearer ' + this.authService.getToken()
-                },
+                }),
                 on: {
+                    closed: () => {
+                        this.removeApolloClientIfExists(options.apolloClientName);
+                    },
                     error: () => {
                         this.apollo.removeClient(options.apolloClientName);
                         this.initSubscriptions(options);