diff --git a/packages/client/lib/client/index.ts b/packages/client/lib/client/index.ts
index fe3ed36b75..c9f04dc037 100644
--- a/packages/client/lib/client/index.ts
+++ b/packages/client/lib/client/index.ts
@@ -268,7 +268,11 @@ export default class RedisClient<M extends RedisModules, S extends RedisScripts>
             .on('data', data => this.#queue.parseResponse(data))
             .on('error', err => {
                 this.emit('error', err);
-                this.#queue.flushWaitingForReply(err);
+                if (!this.#socket.isOpen) {
+                    this.#queue.flushAll(err);
+                } else {
+                    this.#queue.flushWaitingForReply(err);
+                }
             })
             .on('connect', () => this.emit('connect'))
             .on('ready', () => {
diff --git a/packages/client/lib/client/socket.ts b/packages/client/lib/client/socket.ts
index 57ecf609d9..ccbe3f7f2c 100644
--- a/packages/client/lib/client/socket.ts
+++ b/packages/client/lib/client/socket.ts
@@ -3,7 +3,7 @@ import * as net from 'net';
 import * as tls from 'tls';
 import { encodeCommand } from '../commander';
 import { RedisCommandArguments } from '../commands';
-import { ConnectionTimeoutError, ClientClosedError, SocketClosedUnexpectedlyError, AuthError } from '../errors';
+import { ConnectionTimeoutError, ClientClosedError, SocketClosedUnexpectedlyError, AuthError, ReconnectStrategyError } from '../errors';
 import { promiseTimeout } from '../utils';
 
 export interface RedisSocketCommonOptions {
@@ -93,9 +93,16 @@ export default class RedisSocket extends EventEmitter {
     }
 
     async #connect(hadError?: boolean): Promise<void> {
-        this.#isOpen = true;
-        this.#socket = await this.#retryConnection(0, hadError);
-        this.#writableNeedDrain = false;
+        try {
+            this.#isOpen = true;
+            this.#socket = await this.#retryConnection(0, hadError);
+            this.#writableNeedDrain = false;
+        } catch (err) {
+            this.#isOpen = false;
+            this.emit('error', err);
+            this.emit('end');
+            throw err;
+        }
 
         if (!this.#isOpen) {
             this.disconnect();
@@ -134,17 +141,16 @@ export default class RedisSocket extends EventEmitter {
         try {
             return await this.#createSocket();
         } catch (err) {
-            this.emit('error', err);
-
             if (!this.#isOpen) {
                 throw err;
             }
 
             const retryIn = (this.#options?.reconnectStrategy ?? RedisSocket.#defaultReconnectStrategy)(retries);
             if (retryIn instanceof Error) {
-                throw retryIn;
+                throw new ReconnectStrategyError(retryIn, err);
             }
 
+            this.emit('error', err);
             await promiseTimeout(retryIn);
             return this.#retryConnection(retries + 1);
         }
diff --git a/packages/client/lib/errors.ts b/packages/client/lib/errors.ts
index 464e81c2bb..e43dbc8142 100644
--- a/packages/client/lib/errors.ts
+++ b/packages/client/lib/errors.ts
@@ -45,3 +45,14 @@ export class RootNodesUnavailableError extends Error {
         super('All the root nodes are unavailable');
     }
 }
+
+export class ReconnectStrategyError extends Error {
+    originalError: Error;
+    socketError: unknown;
+
+    constructor(originalError: Error, socketError: unknown) {
+        super(originalError.message);
+        this.originalError = originalError;
+        this.socketError = socketError;
+    }
+}