diff --git a/packages/client/lib/client/commands-queue.ts b/packages/client/lib/client/commands-queue.ts
index 52a07a7e3b..ef0db6ad57 100644
--- a/packages/client/lib/client/commands-queue.ts
+++ b/packages/client/lib/client/commands-queue.ts
@@ -1,10 +1,11 @@
-import { SinglyLinkedList, DoublyLinkedNode, DoublyLinkedList } from './linked-list';
+import { DoublyLinkedNode, DoublyLinkedList, EmptyAwareSinglyLinkedList } from './linked-list';
 import encodeCommand from '../RESP/encoder';
 import { Decoder, PUSH_TYPE_MAPPING, RESP_TYPES } from '../RESP/decoder';
 import { TypeMapping, ReplyUnion, RespVersions, RedisArgument } from '../RESP/types';
 import { ChannelListeners, PubSub, PubSubCommand, PubSubListener, PubSubType, PubSubTypeListeners } from './pub-sub';
-import { AbortError, ErrorReply, TimeoutError } from '../errors';
+import { AbortError, ErrorReply, CommandTimeoutDuringMaintananceError, TimeoutError } from '../errors';
 import { MonitorCallback } from '.';
+import { dbgMaintenance } from './enterprise-maintenance-manager';
 
 export interface CommandOptions<T = TypeMapping> {
   chainId?: symbol;
@@ -30,6 +31,7 @@ export interface CommandToWrite extends CommandWaitingForReply {
   timeout: {
     signal: AbortSignal;
     listener: () => unknown;
+    originalTimeout: number | undefined;
   } | undefined;
 }
 
@@ -50,22 +52,75 @@ const RESP2_PUSH_TYPE_MAPPING = {
   [RESP_TYPES.SIMPLE_STRING]: Buffer
 };
 
+// Try to handle a push notification. Return whether you
+// successfully consumed the notification or not. This is
+// important in order for the queue to be able to pass the
+// notification to another handler if the current one did not
+// succeed.
+type PushHandler = (pushItems: Array<any>) => boolean;
+
 export default class RedisCommandsQueue {
   readonly #respVersion;
   readonly #maxLength;
   readonly #toWrite = new DoublyLinkedList<CommandToWrite>();
-  readonly #waitingForReply = new SinglyLinkedList<CommandWaitingForReply>();
+  readonly #waitingForReply = new EmptyAwareSinglyLinkedList<CommandWaitingForReply>();
   readonly #onShardedChannelMoved;
   #chainInExecution: symbol | undefined;
   readonly decoder;
   readonly #pubSub = new PubSub();
 
+  #pushHandlers: PushHandler[] = [this.#onPush.bind(this)];
+
+  #inMaintenance = false;
+
+  set inMaintenance(value: boolean) {
+    this.#inMaintenance = value;
+  }
+
+  #maintenanceCommandTimeout: number | undefined
+
+  setMaintenanceCommandTimeout(ms: number | undefined) {
+    dbgMaintenance(`Setting maintenance command timeout to ${ms}`);
+    // Prevent possible api misuse
+    if (this.#maintenanceCommandTimeout === ms) return;
+
+    this.#maintenanceCommandTimeout = ms;
+
+    let counter = 0;
+
+    // Overwrite timeouts of all eligible toWrite commands
+    for(const node of this.#toWrite.nodes()) {
+      const command = node.value;
+
+      // Remove timeout listener if it exists
+      RedisCommandsQueue.#removeTimeoutListener(command)
+
+      // Determine newTimeout
+      const newTimeout = this.#maintenanceCommandTimeout ?? command.timeout?.originalTimeout;
+      // if no timeout is given and the command didnt have any timeout before, skip
+      if (!newTimeout)  return;
+
+      counter++;
+
+      // Overwrite the command's timeout
+      const signal = AbortSignal.timeout(newTimeout);
+      command.timeout = {
+        signal,
+        listener: () => {
+          this.#toWrite.remove(node);
+          command.reject(this.#inMaintenance ? new CommandTimeoutDuringMaintananceError(newTimeout) : new TimeoutError());
+        },
+        originalTimeout: command.timeout?.originalTimeout
+      };
+      signal.addEventListener('abort', command.timeout.listener, { once: true });
+    };
+    dbgMaintenance(`Total of ${counter} timeouts reset to ${ms}`);
+  }
+
   get isPubSubActive() {
     return this.#pubSub.isActive;
   }
 
-  #invalidateCallback?: (key: RedisArgument | null) => unknown;
-
   constructor(
     respVersion: RespVersions,
     maxLength: number | null | undefined,
@@ -107,6 +162,7 @@ export default class RedisCommandsQueue {
       }
       return true;
     }
+    return false
   }
 
   #getTypeMapping() {
@@ -119,30 +175,27 @@ export default class RedisCommandsQueue {
       onErrorReply: err => this.#onErrorReply(err),
       //TODO: we can shave off a few cycles by not adding onPush handler at all if CSC is not used
       onPush: push => {
-        if (!this.#onPush(push)) {
-          // currently only supporting "invalidate" over RESP3 push messages
-          switch (push[0].toString()) {
-            case "invalidate": {
-              if (this.#invalidateCallback) {
-                if (push[1] !== null) {
-                  for (const key of push[1]) {
-                    this.#invalidateCallback(key);
-                  }
-                } else {
-                  this.#invalidateCallback(null);
-                }
-              }
-              break;
-            }
-          }
+        for(const pushHandler of this.#pushHandlers) {
+          if(pushHandler(push)) return
         }
       },
       getTypeMapping: () => this.#getTypeMapping()
     });
   }
 
-  setInvalidateCallback(callback?: (key: RedisArgument | null) => unknown) {
-    this.#invalidateCallback = callback;
+  addPushHandler(handler: PushHandler): void {
+    this.#pushHandlers.push(handler);
+  }
+
+  async waitForInflightCommandsToComplete(): Promise<void> {
+    // In-flight commands already completed
+    if(this.#waitingForReply.length === 0) {
+      return
+    };
+    // Otherwise wait for in-flight commands to fire `empty` event
+    return new Promise(resolve => {
+      this.#waitingForReply.events.on('empty', resolve)
+    });
   }
 
   addCommand<T>(
@@ -168,15 +221,19 @@ export default class RedisCommandsQueue {
         typeMapping: options?.typeMapping
       };
 
-      const timeout = options?.timeout;
+      // If #maintenanceCommandTimeout was explicitly set, we should
+      // use it instead of the timeout provided by the command
+      const timeout = this.#maintenanceCommandTimeout || options?.timeout
       if (timeout) {
+
         const signal = AbortSignal.timeout(timeout);
         value.timeout = {
           signal,
           listener: () => {
             this.#toWrite.remove(node);
-            value.reject(new TimeoutError());
-          }
+            value.reject(this.#inMaintenance ? new CommandTimeoutDuringMaintananceError(timeout) : new TimeoutError());
+          },
+          originalTimeout: options?.timeout
         };
         signal.addEventListener('abort', value.timeout.listener, { once: true });
       }
@@ -432,7 +489,7 @@ export default class RedisCommandsQueue {
   }
 
   static #removeTimeoutListener(command: CommandToWrite) {
-    command.timeout!.signal.removeEventListener('abort', command.timeout!.listener);
+    command.timeout?.signal.removeEventListener('abort', command.timeout!.listener);
   }
 
   static #flushToWrite(toBeSent: CommandToWrite, err: Error) {
diff --git a/packages/client/lib/client/enterprise-maintenance-manager.ts b/packages/client/lib/client/enterprise-maintenance-manager.ts
new file mode 100644
index 0000000000..a00e1d0e33
--- /dev/null
+++ b/packages/client/lib/client/enterprise-maintenance-manager.ts
@@ -0,0 +1,284 @@
+import EventEmitter from "events";
+import { RedisClientOptions } from ".";
+import RedisCommandsQueue from "./commands-queue";
+import RedisSocket from "./socket";
+import { RedisArgument } from "../..";
+import { isIP } from "net";
+import { lookup } from "dns/promises";
+import assert from "node:assert";
+import { setTimeout } from "node:timers/promises";
+
+export const MAINTENANCE_EVENTS = {
+  PAUSE_WRITING: "pause-writing",
+  RESUME_WRITING: "resume-writing",
+  TIMEOUTS_UPDATE: "timeouts-update",
+} as const;
+
+const PN = {
+  MOVING: "MOVING",
+  MIGRATING: "MIGRATING",
+  MIGRATED: "MIGRATED",
+  FAILING_OVER: "FAILING_OVER",
+  FAILED_OVER: "FAILED_OVER",
+};
+
+export interface SocketTimeoutUpdate {
+  inMaintenance: boolean;
+  timeout?: number;
+}
+
+export const dbgMaintenance = (...args: any[]) => {
+  if (!process.env.DEBUG_MAINTENANCE) return;
+  return console.log("[MNT]", ...args);
+};
+
+export default class EnterpriseMaintenanceManager extends EventEmitter {
+  #commandsQueue: RedisCommandsQueue;
+  #options: RedisClientOptions;
+  #isMaintenance = 0;
+
+  static setupDefaultMaintOptions(options: RedisClientOptions) {
+    if (options.maintPushNotifications === undefined) {
+      options.maintPushNotifications =
+        options?.RESP === 3 ? "auto" : "disabled";
+    }
+    if (options.maintMovingEndpointType === undefined) {
+      options.maintMovingEndpointType = "auto";
+    }
+    if (options.maintRelaxedSocketTimeout === undefined) {
+      options.maintRelaxedSocketTimeout = 10000;
+    }
+    if (options.maintRelaxedCommandTimeout === undefined) {
+      options.maintRelaxedCommandTimeout = 10000;
+    }
+  }
+
+  static async getHandshakeCommand(
+    tls: boolean,
+    host: string,
+    options: RedisClientOptions,
+  ): Promise<
+    | { cmd: Array<RedisArgument>; errorHandler: (error: Error) => void }
+    | undefined
+  > {
+    if (options.maintPushNotifications === "disabled") return;
+
+    const movingEndpointType = await determineEndpoint(tls, host, options);
+    return {
+      cmd: [
+        "CLIENT",
+        "MAINT_NOTIFICATIONS",
+        "ON",
+        "moving-endpoint-type",
+        movingEndpointType,
+      ],
+      errorHandler: (error: Error) => {
+        dbgMaintenance("handshake failed:", error);
+        if (options.maintPushNotifications === "enabled") {
+          throw error;
+        }
+      },
+    };
+  }
+
+  constructor(commandsQueue: RedisCommandsQueue, options: RedisClientOptions) {
+    super();
+    this.#commandsQueue = commandsQueue;
+    this.#options = options;
+
+    this.#commandsQueue.addPushHandler(this.#onPush);
+  }
+
+  #onPush = (push: Array<any>): boolean => {
+    dbgMaintenance("ONPUSH:", push.map(String));
+    switch (push[0].toString()) {
+      case PN.MOVING: {
+        // [ 'MOVING', '17', '15', '54.78.247.156:12075' ]
+        //             ^seq   ^after    ^new ip
+        const afterSeconds = push[2];
+        const url: string | null = push[3] ? String(push[3]) : null;
+        dbgMaintenance("Received MOVING:", afterSeconds, url);
+        this.#onMoving(afterSeconds, url);
+        return true;
+      }
+      case PN.MIGRATING:
+      case PN.FAILING_OVER: {
+        dbgMaintenance("Received MIGRATING|FAILING_OVER");
+        this.#onMigrating();
+        return true;
+      }
+      case PN.MIGRATED:
+      case PN.FAILED_OVER: {
+        dbgMaintenance("Received MIGRATED|FAILED_OVER");
+        this.#onMigrated();
+        return true;
+      }
+    }
+    return false;
+  };
+
+  //  Queue:
+  //     toWrite [ C D E ]
+  //     waitingForReply [ A B ]   - aka In-flight commands
+  //
+  //  time: ---1-2---3-4-5-6---------------------------
+  //
+  //  1. [EVENT] MOVING PN received
+  //  2. [ACTION] Pause writing ( we need to wait for new socket to connect and for all in-flight commands to complete )
+  //  3. [EVENT] New socket connected
+  //  4. [EVENT] In-flight commands completed
+  //  5. [ACTION] Destroy old socket
+  //  6. [ACTION] Resume writing -> we are going to write to the new socket from now on
+  #onMoving = async (
+    afterSeconds: number,
+    url: string | null,
+  ): Promise<void> => {
+    // 1 [EVENT] MOVING PN received
+    this.#onMigrating();
+
+    let host: string;
+    let port: number;
+
+    // The special value `none` indicates that the `MOVING` message doesn’t need
+    // to contain an endpoint. Instead it contains the value `null` then. In
+    // such a corner case, the client is expected to schedule a graceful
+    // reconnect to its currently configured endpoint after half of the grace
+    // period that was communicated by the server is over.
+    if (url === null) {
+      assert(this.#options.maintMovingEndpointType === "none");
+      assert(this.#options.socket !== undefined);
+      assert("host" in this.#options.socket);
+      assert(typeof this.#options.socket.host === "string");
+      host = this.#options.socket.host;
+      assert(typeof this.#options.socket.port === "number");
+      port = this.#options.socket.port;
+      const waitTime = (afterSeconds * 1000) / 2;
+      dbgMaintenance(`Wait for ${waitTime}ms`);
+      await setTimeout(waitTime);
+    } else {
+      const split = url.split(":");
+      host = split[0];
+      port = Number(split[1]);
+    }
+
+    // 2 [ACTION] Pause writing
+    dbgMaintenance("Pausing writing of new commands to old socket");
+    this.emit(MAINTENANCE_EVENTS.PAUSE_WRITING);
+
+    const newSocket = new RedisSocket({
+      ...this.#options.socket,
+      host,
+      port,
+    });
+    dbgMaintenance(
+      `Set timeout for new socket to ${this.#options.maintRelaxedSocketTimeout}`,
+    );
+    newSocket.setMaintenanceTimeout(this.#options.maintRelaxedSocketTimeout);
+    dbgMaintenance(`Connecting to new socket: ${host}:${port}`);
+    await newSocket.connect();
+    dbgMaintenance(`Connected to new socket`);
+    // 3 [EVENT] New socket connected
+
+    dbgMaintenance(`Wait for all in-flight commands to complete`);
+    await this.#commandsQueue.waitForInflightCommandsToComplete();
+    dbgMaintenance(`In-flight commands completed`);
+    // 4 [EVENT] In-flight commands completed
+
+    // 5 + 6
+    dbgMaintenance("Resume writing");
+    this.emit(MAINTENANCE_EVENTS.RESUME_WRITING, newSocket);
+    this.#onMigrated();
+  };
+
+  #onMigrating = async () => {
+    this.#isMaintenance++;
+    if (this.#isMaintenance > 1) {
+      dbgMaintenance(`Timeout relaxation already done`);
+      return;
+    }
+
+    this.#commandsQueue.inMaintenance = true;
+    this.#commandsQueue.setMaintenanceCommandTimeout(
+      this.#options.maintRelaxedCommandTimeout,
+    );
+
+    this.emit(MAINTENANCE_EVENTS.TIMEOUTS_UPDATE, {
+      inMaintenance: true,
+      timeout: this.#options.maintRelaxedSocketTimeout,
+    } satisfies SocketTimeoutUpdate);
+  };
+
+  #onMigrated = async () => {
+    this.#isMaintenance--;
+    assert(this.#isMaintenance >= 0);
+    if (this.#isMaintenance > 0) {
+      dbgMaintenance(`Not ready to unrelax timeouts yet`);
+      return;
+    }
+
+    this.#commandsQueue.inMaintenance = false;
+    this.#commandsQueue.setMaintenanceCommandTimeout(undefined);
+
+    this.emit(MAINTENANCE_EVENTS.TIMEOUTS_UPDATE, {
+      inMaintenance: false,
+      timeout: undefined,
+    } satisfies SocketTimeoutUpdate);
+  };
+}
+
+export type MovingEndpointType =
+  | "auto"
+  | "internal-ip"
+  | "internal-fqdn"
+  | "external-ip"
+  | "external-fqdn"
+  | "none";
+
+function isPrivateIP(ip: string): boolean {
+  const version = isIP(ip);
+  if (version === 4) {
+    const octets = ip.split(".").map(Number);
+    return (
+      octets[0] === 10 ||
+      (octets[0] === 172 && octets[1] >= 16 && octets[1] <= 31) ||
+      (octets[0] === 192 && octets[1] === 168)
+    );
+  }
+  if (version === 6) {
+    return (
+      ip.startsWith("fc") || // Unique local
+      ip.startsWith("fd") || // Unique local
+      ip === "::1" || // Loopback
+      ip.startsWith("fe80") // Link-local unicast
+    );
+  }
+  return false;
+}
+
+async function determineEndpoint(
+  tlsEnabled: boolean,
+  host: string,
+  options: RedisClientOptions,
+): Promise<MovingEndpointType> {
+  assert(options.maintMovingEndpointType !== undefined);
+  if (options.maintMovingEndpointType !== "auto") {
+    dbgMaintenance(
+      `Determine endpoint type: ${options.maintMovingEndpointType}`,
+    );
+    return options.maintMovingEndpointType;
+  }
+
+  const ip = isIP(host) ? host : (await lookup(host, { family: 0 })).address;
+
+  const isPrivate = isPrivateIP(ip);
+
+  let result: MovingEndpointType;
+  if (tlsEnabled) {
+    result = isPrivate ? "internal-fqdn" : "external-fqdn";
+  } else {
+    result = isPrivate ? "internal-ip" : "external-ip";
+  }
+
+  dbgMaintenance(`Determine endpoint type: ${result}`);
+  return result;
+}
diff --git a/packages/client/lib/client/index.ts b/packages/client/lib/client/index.ts
index ccad872e22..df396a1202 100644
--- a/packages/client/lib/client/index.ts
+++ b/packages/client/lib/client/index.ts
@@ -1,5 +1,5 @@
 import COMMANDS from '../commands';
-import RedisSocket, { RedisSocketOptions } from './socket';
+import RedisSocket, { RedisSocketOptions, RedisTcpSocketOptions } from './socket';
 import { BasicAuth, CredentialsError, CredentialsProvider, StreamingCredentialsProvider, UnableToObtainNewCredentialsError, Disposable } from '../authx';
 import RedisCommandsQueue, { CommandOptions } from './commands-queue';
 import { EventEmitter } from 'node:events';
@@ -20,6 +20,8 @@ import { BasicClientSideCache, ClientSideCacheConfig, ClientSideCacheProvider }
 import { BasicCommandParser, CommandParser } from './parser';
 import SingleEntryCache from '../single-entry-cache';
 import { version } from '../../package.json'
+import EnterpriseMaintenanceManager, { MAINTENANCE_EVENTS, MovingEndpointType, SocketTimeoutUpdate } from './enterprise-maintenance-manager';
+import assert from 'node:assert';
 
 export interface RedisClientOptions<
   M extends RedisModules = RedisModules,
@@ -144,7 +146,46 @@ export interface RedisClientOptions<
    * Tag to append to library name that is sent to the Redis server
    */
   clientInfoTag?: string;
-}
+  /**
+   * Controls how the client handles Redis Enterprise maintenance push notifications.
+   *
+   * - `disabled`: The feature is not used by the client.
+   * - `enabled`: The client attempts to enable the feature on the server. If the server responds with an error, the connection is interrupted.
+   * - `auto`: The client attempts to enable the feature on the server. If the server returns an error, the client disables the feature and continues.
+   *
+   * The default is `auto`.
+   */
+  maintPushNotifications?: 'disabled' | 'enabled' | 'auto';
+  /**
+   * Controls how the client requests the endpoint to reconnect to during a MOVING notification in Redis Enterprise maintenance.
+   *
+   * - `auto`: If the connection is opened to a name or IP address that is from/resolves to a reserved private IP range, request an internal endpoint (e.g., internal-ip), otherwise an external one. If TLS is enabled, then request a FQDN.
+   * - `internal-ip`: Enforce requesting the internal IP.
+   * - `internal-fqdn`: Enforce requesting the internal FQDN.
+   * - `external-ip`: Enforce requesting the external IP address.
+   * - `external-fqdn`: Enforce requesting the external FQDN.
+   * - `none`: Used to request a null endpoint, which tells the client to reconnect based on its current config
+
+   * The default is `auto`.
+   */
+  maintMovingEndpointType?: MovingEndpointType;
+  /**
+   * Specifies a more relaxed timeout (in milliseconds) for commands during a maintenance window.
+   * This helps minimize command timeouts during maintenance. If not provided, the `commandOptions.timeout`
+   * will be used instead. Timeouts during maintenance period result in a `CommandTimeoutDuringMaintanance` error.
+   *
+   * The default is 10000
+   */
+  maintRelaxedCommandTimeout?: number;
+  /**
+   * Specifies a more relaxed timeout (in milliseconds) for the socket during a maintenance window.
+   * This helps minimize socket timeouts during maintenance. If not provided, the `socket.timeout`
+   * will be used instead. Timeouts during maintenance period result in a `SocketTimeoutDuringMaintanance` error.
+   *
+   * The default is 10000
+   */
+  maintRelaxedSocketTimeout?: number;
+};
 
 type WithCommands<
   RESP extends RespVersions,
@@ -390,7 +431,7 @@ export default class RedisClient<
   }
 
   readonly #options?: RedisClientOptions<M, F, S, RESP, TYPE_MAPPING>;
-  readonly #socket: RedisSocket;
+  #socket: RedisSocket;
   readonly #queue: RedisCommandsQueue;
   #selectedDB = 0;
   #monitorCallback?: MonitorCallback<TYPE_MAPPING>;
@@ -403,11 +444,16 @@ export default class RedisClient<
   #watchEpoch?: number;
   #clientSideCache?: ClientSideCacheProvider;
   #credentialsSubscription: Disposable | null = null;
+  // Flag used to pause writing to the socket during maintenance windows.
+  // When true, prevents new commands from being written while waiting for:
+  // 1. New socket to be ready after maintenance redirect
+  // 2. In-flight commands on the old socket to complete
+  #pausedForMaintenance = false;
+
   get clientSideCache() {
     return this._self.#clientSideCache;
   }
 
-
   get options(): RedisClientOptions<M, F, S, RESP> | undefined {
     return this._self.#options;
   }
@@ -441,6 +487,15 @@ export default class RedisClient<
     return this._self.#dirtyWatch !== undefined
   }
 
+  async #resumeFromMaintenance(newSocket: RedisSocket) {
+    this._self.#socket.removeAllListeners();
+    this._self.#socket.destroy();
+    this._self.#socket = newSocket;
+    this._self.#pausedForMaintenance = false;
+    await this._self.#initiateSocket();
+    this._self.#maybeScheduleWrite();
+  }
+
   /**
    * Marks the client's WATCH command as invalidated due to a topology change.
    * This will cause any subsequent EXEC in a transaction to fail with a WatchError.
@@ -455,7 +510,17 @@ export default class RedisClient<
     this.#validateOptions(options)
     this.#options = this.#initiateOptions(options);
     this.#queue = this.#initiateQueue();
-    this.#socket = this.#initiateSocket();
+    this.#socket = this.#createSocket(this.#options);
+    
+    if(options?.maintPushNotifications !== 'disabled') {
+      new EnterpriseMaintenanceManager(this.#queue, this.#options!)
+        .on(MAINTENANCE_EVENTS.PAUSE_WRITING, () => this._self.#pausedForMaintenance = true)
+        .on(MAINTENANCE_EVENTS.RESUME_WRITING, this.#resumeFromMaintenance.bind(this))
+        .on(MAINTENANCE_EVENTS.TIMEOUTS_UPDATE, (value: SocketTimeoutUpdate) => {
+          this._self.#socket.inMaintenance = value.inMaintenance;
+          this._self.#socket.setMaintenanceTimeout(value.timeout);
+        });
+    };
 
     if (options?.clientSideCache) {
       if (options.clientSideCache instanceof ClientSideCacheProvider) {
@@ -464,7 +529,19 @@ export default class RedisClient<
         const cscConfig = options.clientSideCache;
         this.#clientSideCache = new BasicClientSideCache(cscConfig);
       }
-      this.#queue.setInvalidateCallback(this.#clientSideCache.invalidate.bind(this.#clientSideCache));
+      this.#queue.addPushHandler((push: Array<any>): boolean => {
+        if (push[0].toString() !== 'invalidate') return false;
+
+        if (push[1] !== null) {
+          for (const key of push[1]) {
+            this.#clientSideCache?.invalidate(key)
+          }
+        } else {
+          this.#clientSideCache?.invalidate(null)
+        }
+
+        return true
+      });
     }
   }
 
@@ -473,7 +550,12 @@ export default class RedisClient<
       throw new Error('Client Side Caching is only supported with RESP3');
     }
 
+    if (options?.maintPushNotifications && options?.maintPushNotifications !== 'disabled' && options?.RESP !== 3) {
+      throw new Error('Graceful Maintenance is only supported with RESP3');
+    }
+
   }
+
   #initiateOptions(options?: RedisClientOptions<M, F, S, RESP, TYPE_MAPPING>): RedisClientOptions<M, F, S, RESP, TYPE_MAPPING> | undefined {
 
     // Convert username/password to credentialsProvider if no credentialsProvider is already in place
@@ -496,7 +578,13 @@ export default class RedisClient<
       this._commandOptions = options.commandOptions;
     }
 
+
+
     if (options) {
+      if(options.maintPushNotifications !== 'disabled') {
+        EnterpriseMaintenanceManager.setupDefaultMaintOptions(options)
+      }
+
       return RedisClient.parseOptions(options);
     }
 
@@ -673,41 +761,20 @@ export default class RedisClient<
       commands.push({cmd: this.#clientSideCache.trackingOn()});
     }
 
+    assert(this.#options?.socket !== undefined);
+    const { tls, host } = this.#options?.socket as RedisTcpSocketOptions;
+    const maintenanceHandshakeCmd = await EnterpriseMaintenanceManager.getHandshakeCommand(!!tls, host!, this.#options);
+    if(maintenanceHandshakeCmd) {
+      commands.push(maintenanceHandshakeCmd);
+    };
+
     return commands;
   }
 
-  #initiateSocket(): RedisSocket {
-    const socketInitiator = async () => {
-      const promises = [],
-        chainId = Symbol('Socket Initiator');
+  async #initiateSocket(): Promise<void> {
+    await this.#socket.waitForReady();
 
-      const resubscribePromise = this.#queue.resubscribe(chainId);
-      if (resubscribePromise) {
-        promises.push(resubscribePromise);
-      }
-
-      if (this.#monitorCallback) {
-        promises.push(
-          this.#queue.monitor(
-            this.#monitorCallback,
-            {
-              typeMapping: this._commandOptions?.typeMapping,
-              chainId,
-              asap: true
-            }
-          )
-        );
-      }
-
-      promises.push(...(await this.#handshake(chainId, true)));
-
-      if (promises.length) {
-        this.#write();
-        return Promise.all(promises);
-      }
-    };
-
-    return new RedisSocket(socketInitiator, this.#options?.socket)
+    this.#socket
       .on('data', chunk => {
         try {
           this.#queue.decoder.write(chunk);
@@ -725,15 +792,47 @@ export default class RedisClient<
           this.#queue.flushAll(err);
         }
       })
-      .on('connect', () => this.emit('connect'))
-      .on('ready', () => {
-        this.emit('ready');
-        this.#setPingTimer();
-        this.#maybeScheduleWrite();
-      })
       .on('reconnecting', () => this.emit('reconnecting'))
       .on('drain', () => this.#maybeScheduleWrite())
       .on('end', () => this.emit('end'));
+
+    const promises = [];
+    const chainId = Symbol('Socket Initiator');
+
+    const resubscribePromise = this.#queue.resubscribe(chainId);
+    if (resubscribePromise) {
+      promises.push(resubscribePromise);
+    }
+
+    if (this.#monitorCallback) {
+      promises.push(
+        this.#queue.monitor(
+          this.#monitorCallback,
+          {
+            typeMapping: this._commandOptions?.typeMapping,
+            chainId,
+            asap: true
+          }
+        )
+      );
+    }
+
+    promises.push(...(await this.#handshake(chainId, true)));
+
+    this.#setPingTimer();
+
+    if (promises.length) {
+      this.#write();
+      await Promise.all(promises);
+    }
+  }
+
+  #createSocket(options?: RedisClientOptions<M, F, S, RESP, TYPE_MAPPING>): RedisSocket {
+    return new RedisSocket(options?.socket)
+      .on('connect', () => this.emit('connect'))
+      .on('ready', () => {
+        this.emit('ready');
+      });
   }
 
   #pingTimer?: NodeJS.Timeout;
@@ -842,6 +941,7 @@ export default class RedisClient<
 
   async connect() {
     await this._self.#socket.connect();
+    await this._self.#initiateSocket();
     return this as unknown as RedisClientType<M, F, S, RESP, TYPE_MAPPING>;
   }
 
@@ -1074,6 +1174,9 @@ export default class RedisClient<
   }
 
   #write() {
+    if(this.#pausedForMaintenance) {
+      return
+    }
     this.#socket.write(this.#queue.commandsToWrite());
   }
 
diff --git a/packages/client/lib/client/linked-list.spec.ts b/packages/client/lib/client/linked-list.spec.ts
index 9547fb81c7..c791d21900 100644
--- a/packages/client/lib/client/linked-list.spec.ts
+++ b/packages/client/lib/client/linked-list.spec.ts
@@ -1,138 +1,197 @@
-import { SinglyLinkedList, DoublyLinkedList } from './linked-list';
-import { equal, deepEqual } from 'assert/strict';
-
-describe('DoublyLinkedList', () => {
+import {
+  SinglyLinkedList,
+  DoublyLinkedList,
+  EmptyAwareSinglyLinkedList,
+} from "./linked-list";
+import { equal, deepEqual } from "assert/strict";
+
+describe("DoublyLinkedList", () => {
   const list = new DoublyLinkedList();
 
-  it('should start empty', () => {
+  it("should start empty", () => {
     equal(list.length, 0);
     equal(list.head, undefined);
     equal(list.tail, undefined);
     deepEqual(Array.from(list), []);
   });
 
-  it('shift empty', () => {
+  it("shift empty", () => {
     equal(list.shift(), undefined);
     equal(list.length, 0);
     deepEqual(Array.from(list), []);
   });
 
-  it('push 1', () => {
+  it("push 1", () => {
     list.push(1);
     equal(list.length, 1);
     deepEqual(Array.from(list), [1]);
   });
 
-  it('push 2', () => {
+  it("push 2", () => {
     list.push(2);
     equal(list.length, 2);
     deepEqual(Array.from(list), [1, 2]);
   });
 
-  it('unshift 0', () => {
+  it("unshift 0", () => {
     list.unshift(0);
     equal(list.length, 3);
     deepEqual(Array.from(list), [0, 1, 2]);
   });
 
-  it('remove middle node', () => {
+  it("remove middle node", () => {
     list.remove(list.head!.next!);
     equal(list.length, 2);
     deepEqual(Array.from(list), [0, 2]);
   });
 
-  it('remove head', () => {
+  it("remove head", () => {
     list.remove(list.head!);
     equal(list.length, 1);
     deepEqual(Array.from(list), [2]);
   });
 
-  it('remove tail', () => {
+  it("remove tail", () => {
     list.remove(list.tail!);
     equal(list.length, 0);
     deepEqual(Array.from(list), []);
   });
 
-  it('unshift empty queue', () => {
+  it("unshift empty queue", () => {
     list.unshift(0);
     equal(list.length, 1);
     deepEqual(Array.from(list), [0]);
   });
 
-  it('push 1', () => {
+  it("push 1", () => {
     list.push(1);
     equal(list.length, 2);
     deepEqual(Array.from(list), [0, 1]);
   });
 
-  it('shift', () => {
+  it("shift", () => {
     equal(list.shift(), 0);
     equal(list.length, 1);
     deepEqual(Array.from(list), [1]);
   });
 
-  it('shift last element', () => {
+  it("shift last element", () => {
     equal(list.shift(), 1);
     equal(list.length, 0);
     deepEqual(Array.from(list), []);
   });
+
+  it("provide forEach for nodes", () => {
+    list.reset();
+    list.push(1);
+    list.push(2);
+    list.push(3);
+    let count = 0;
+    for(const _ of list.nodes()) {
+      count++;
+    }
+    equal(count, 3);
+    for(const _ of list.nodes()) {
+      count++;
+    }
+    equal(count, 6);
+  });
 });
 
-describe('SinglyLinkedList', () => {
+describe("SinglyLinkedList", () => {
   const list = new SinglyLinkedList();
 
-  it('should start empty', () => {
+  it("should start empty", () => {
     equal(list.length, 0);
     equal(list.head, undefined);
     equal(list.tail, undefined);
     deepEqual(Array.from(list), []);
   });
 
-  it('shift empty', () => {
+  it("shift empty", () => {
     equal(list.shift(), undefined);
     equal(list.length, 0);
     deepEqual(Array.from(list), []);
   });
 
-  it('push 1', () => {
+  it("push 1", () => {
     list.push(1);
     equal(list.length, 1);
     deepEqual(Array.from(list), [1]);
   });
 
-  it('push 2', () => {
+  it("push 2", () => {
     list.push(2);
     equal(list.length, 2);
     deepEqual(Array.from(list), [1, 2]);
   });
 
-  it('push 3', () => {
+  it("push 3", () => {
     list.push(3);
     equal(list.length, 3);
     deepEqual(Array.from(list), [1, 2, 3]);
   });
 
-  it('shift 1', () => {
+  it("shift 1", () => {
     equal(list.shift(), 1);
     equal(list.length, 2);
     deepEqual(Array.from(list), [2, 3]);
   });
 
-  it('shift 2', () => {
+  it("shift 2", () => {
     equal(list.shift(), 2);
     equal(list.length, 1);
     deepEqual(Array.from(list), [3]);
   });
 
-  it('shift 3', () => {
+  it("shift 3", () => {
     equal(list.shift(), 3);
     equal(list.length, 0);
     deepEqual(Array.from(list), []);
   });
 
-  it('should be empty', () => {
+  it("should be empty", () => {
     equal(list.length, 0);
     equal(list.head, undefined);
     equal(list.tail, undefined);
   });
 });
+
+describe("EmptyAwareSinglyLinkedList", () => {
+  it("should emit 'empty' event when reset", () => {
+    const list = new EmptyAwareSinglyLinkedList<number>();
+    let count = 0;
+    list.events.on("empty", () => count++);
+    list.push(1);
+    list.reset();
+    equal(count, 1);
+    list.reset();
+    equal(count, 1);
+  });
+
+  it("should emit 'empty' event when shift makes the list empty", () => {
+    const list = new EmptyAwareSinglyLinkedList<number>();
+    let count = 0;
+    list.events.on("empty", () => count++);
+    list.push(1);
+    list.push(2);
+    list.shift();
+    equal(count, 0);
+    list.shift();
+    equal(count, 1);
+    list.shift();
+    equal(count, 1);
+  });
+
+  it("should emit 'empty' event when remove makes the list empty", () => {
+    const list = new EmptyAwareSinglyLinkedList<number>();
+    let count = 0;
+    list.events.on("empty", () => count++);
+    const node1 = list.push(1);
+    const node2 = list.push(2);
+    list.remove(node1, undefined);
+    equal(count, 0);
+    list.remove(node2, undefined);
+    equal(count, 1);
+  });
+});
diff --git a/packages/client/lib/client/linked-list.ts b/packages/client/lib/client/linked-list.ts
index 29678f027b..461f1d4082 100644
--- a/packages/client/lib/client/linked-list.ts
+++ b/packages/client/lib/client/linked-list.ts
@@ -1,3 +1,5 @@
+import EventEmitter from "events";
+
 export interface DoublyLinkedNode<T> {
   value: T;
   previous: DoublyLinkedNode<T> | undefined;
@@ -32,7 +34,7 @@ export class DoublyLinkedList<T> {
         next: undefined,
         value
       };
-    } 
+    }
 
     return this.#tail = this.#tail.next = {
       previous: this.#tail,
@@ -93,7 +95,7 @@ export class DoublyLinkedList<T> {
       node.previous!.next = node.next;
       node.previous = undefined;
     }
-    
+
     node.next = undefined;
   }
 
@@ -109,6 +111,14 @@ export class DoublyLinkedList<T> {
       node = node.next;
     }
   }
+
+  *nodes() {
+    let node = this.#head;
+    while(node) {
+      yield node;
+      node = node.next;
+    }
+  }
 }
 
 export interface SinglyLinkedNode<T> {
@@ -201,3 +211,30 @@ export class SinglyLinkedList<T> {
     }
   }
 }
+
+export class EmptyAwareSinglyLinkedList<T> extends SinglyLinkedList<T> {
+  readonly events = new EventEmitter();
+  reset() {
+    const old = this.length;
+    super.reset();
+    if(old !== this.length && this.length === 0) {
+      this.events.emit('empty');
+    }
+  }
+  shift(): T | undefined {
+    const old = this.length;
+    const ret = super.shift();
+    if(old !== this.length && this.length === 0) {
+      this.events.emit('empty');
+    }
+    return ret;
+  }
+  remove(node: SinglyLinkedNode<T>, parent: SinglyLinkedNode<T> | undefined) {
+    const old = this.length;
+    super.remove(node, parent);
+    if(old !== this.length && this.length === 0) {
+      this.events.emit('empty');
+    }
+  }
+
+}
diff --git a/packages/client/lib/client/socket.ts b/packages/client/lib/client/socket.ts
index 5f0bcc4492..d6c7880a48 100644
--- a/packages/client/lib/client/socket.ts
+++ b/packages/client/lib/client/socket.ts
@@ -1,9 +1,10 @@
 import { EventEmitter, once } from 'node:events';
 import net from 'node:net';
 import tls from 'node:tls';
-import { ConnectionTimeoutError, ClientClosedError, SocketClosedUnexpectedlyError, ReconnectStrategyError, SocketTimeoutError } from '../errors';
+import { ConnectionTimeoutError, ClientClosedError, SocketClosedUnexpectedlyError, ReconnectStrategyError, SocketTimeoutError, SocketTimeoutDuringMaintananceError } from '../errors';
 import { setTimeout } from 'node:timers/promises';
 import { RedisArgument } from '../RESP/types';
+import { dbgMaintenance } from './enterprise-maintenance-manager';
 
 type NetOptions = {
   tls?: false;
@@ -51,15 +52,14 @@ export type RedisTcpSocketOptions = RedisTcpOptions | RedisTlsOptions;
 
 export type RedisSocketOptions = RedisTcpSocketOptions | RedisIpcOptions;
 
-export type RedisSocketInitiator = () => void | Promise<unknown>;
-
 export default class RedisSocket extends EventEmitter {
-  readonly #initiator;
   readonly #connectTimeout;
   readonly #reconnectStrategy;
   readonly #socketFactory;
   readonly #socketTimeout;
 
+  #maintenanceTimeout: number | undefined;
+
   #socket?: net.Socket | tls.TLSSocket;
 
   #isOpen = false;
@@ -82,16 +82,29 @@ export default class RedisSocket extends EventEmitter {
     return this.#socketEpoch;
   }
 
-  constructor(initiator: RedisSocketInitiator, options?: RedisSocketOptions) {
+  #inMaintenance = false;
+
+  set inMaintenance(value: boolean) {
+    this.#inMaintenance = value;
+  }
+
+  constructor(options?: RedisSocketOptions) {
     super();
 
-    this.#initiator = initiator;
     this.#connectTimeout = options?.connectTimeout ?? 5000;
     this.#reconnectStrategy = this.#createReconnectStrategy(options);
     this.#socketFactory = this.#createSocketFactory(options);
     this.#socketTimeout = options?.socketTimeout;
   }
 
+  async waitForReady(): Promise<void> {
+    if (this.#isReady) return
+    return new Promise((resolve, reject) => {
+      this.once('ready', resolve);
+      this.once('error', reject);
+    });
+  }
+
   #createReconnectStrategy(options?: RedisSocketOptions): ReconnectStrategyFunction {
     const strategy = options?.reconnectStrategy;
     if (strategy === false || typeof strategy === 'number') {
@@ -214,14 +227,6 @@ export default class RedisSocket extends EventEmitter {
       try {
         this.#socket = await this.#createSocket();
         this.emit('connect');
-
-        try {
-          await this.#initiator();
-        } catch (err) {
-          this.#socket.destroy();
-          this.#socket = undefined;
-          throw err;
-        }
         this.#isReady = true;
         this.#socketEpoch++;
         this.emit('ready');
@@ -238,6 +243,19 @@ export default class RedisSocket extends EventEmitter {
     } while (this.#isOpen && !this.#isReady);
   }
 
+  setMaintenanceTimeout(ms?: number) {
+    dbgMaintenance(`Set socket timeout to ${ms}`);
+    if (this.#maintenanceTimeout === ms) return;
+
+    this.#maintenanceTimeout = ms;
+
+    if(ms !== undefined) {
+      this.#socket?.setTimeout(ms);
+    } else {
+      this.#socket?.setTimeout(this.#socketTimeout ?? 0);
+    }
+  }
+
   async #createSocket(): Promise<net.Socket | tls.TLSSocket> {
     const socket = this.#socketFactory.create();
 
@@ -260,7 +278,10 @@ export default class RedisSocket extends EventEmitter {
 
     if (this.#socketTimeout) {
       socket.once('timeout', () => {
-        socket.destroy(new SocketTimeoutError(this.#socketTimeout!));
+        const error = this.#inMaintenance
+          ? new SocketTimeoutDuringMaintananceError(this.#socketTimeout!)
+          : new SocketTimeoutError(this.#socketTimeout!)
+        socket.destroy(error);
       });
       socket.setTimeout(this.#socketTimeout);
     }
diff --git a/packages/client/lib/errors.ts b/packages/client/lib/errors.ts
index db37ec1a9b..4833c984e1 100644
--- a/packages/client/lib/errors.ts
+++ b/packages/client/lib/errors.ts
@@ -76,6 +76,18 @@ export class BlobError extends ErrorReply {}
 
 export class TimeoutError extends Error {}
 
+export class SocketTimeoutDuringMaintananceError extends TimeoutError {
+  constructor(timeout: number) {
+    super(`Socket timeout during maintenance. Expecting data, but didn't receive any in ${timeout}ms.`);
+  }
+}
+
+export class CommandTimeoutDuringMaintananceError extends TimeoutError {
+  constructor(timeout: number) {
+    super(`Command timeout during maintenance. Waited to write command for more than ${timeout}ms.`);
+  }
+}
+
 export class MultiErrorReply extends ErrorReply {
   replies: Array<ErrorReply>;
   errorIndexes: Array<number>;