diff --git a/components/ws-manager-bridge/src/cluster-service-server.ts b/components/ws-manager-bridge/src/cluster-service-server.ts
index 3238c7888fe2c2..0d919bdc51d11c 100644
--- a/components/ws-manager-bridge/src/cluster-service-server.ts
+++ b/components/ws-manager-bridge/src/cluster-service-server.ts
@@ -155,37 +155,13 @@ export class ClusterService implements IClusterServiceServer {
                     tls,
                 };
 
-                const enabled = await getExperimentsClientForBackend().getValueAsync(
-                    "workspace_classes_backend",
+                let classConstraints = await getSupportedWorkspaceClasses(
+                    this.clientProvider,
+                    newCluster,
+                    this.config.installation,
                     false,
-                    {},
                 );
-                if (enabled) {
-                    let classConstraints = await getSupportedWorkspaceClasses(
-                        this.clientProvider,
-                        newCluster,
-                        this.config.installation,
-                        false,
-                    );
-                    newCluster.admissionConstraints = admissionConstraints.concat(classConstraints);
-                } else {
-                    // try to connect to validate the config. Throws an exception if it fails.
-                    await new Promise<void>((resolve, reject) => {
-                        const c = this.clientProvider.createConnection(WorkspaceManagerClient, newCluster);
-                        c.getWorkspaces(new GetWorkspacesRequest(), (err: any) => {
-                            if (err) {
-                                reject(
-                                    new GRPCError(
-                                        grpc.status.FAILED_PRECONDITION,
-                                        `cannot reach ${req.url}: ${err.message}`,
-                                    ),
-                                );
-                            } else {
-                                resolve();
-                            }
-                        });
-                    });
-                }
+                newCluster.admissionConstraints = admissionConstraints.concat(classConstraints);
 
                 await this.clusterDB.save(newCluster);
                 log.info({}, "cluster registered", { cluster: req.name });
diff --git a/components/ws-manager-bridge/src/cluster-sync-service.ts b/components/ws-manager-bridge/src/cluster-sync-service.ts
index f1cb7dadc16620..6f05c36e881ae5 100644
--- a/components/ws-manager-bridge/src/cluster-sync-service.ts
+++ b/components/ws-manager-bridge/src/cluster-sync-service.ts
@@ -42,11 +42,6 @@ export class ClusterSyncService {
     }
 
     private async reconcile() {
-        const enabled = await this.featureClient.getValueAsync("workspace_classes_backend", false, {});
-        if (!enabled) {
-            return;
-        }
-
         log.debug("reconciling workspace classes...");
         let allClusters = await this.clusterDB.findFiltered({ applicationCluster: this.config.installation });
         for (const cluster of allClusters) {