diff --git a/src/Hamok.ts b/src/Hamok.ts
index eb16a55..af28001 100644
--- a/src/Hamok.ts
+++ b/src/Hamok.ts
@@ -1117,11 +1117,16 @@ export class Hamok<AppData extends Record<string, unknown> = Record<string, unkn
 					logger.trace('%s Received join notification from itself %o', this.localPeerId, notification);
 					break;
 				}
+				if (this.raft.remotePeers.has(notification.sourcePeerId)) {
+					logger.trace('%s Received join notification from %s, but it is already in the remote peers', this.localPeerId, notification.sourcePeerId);
+					break;
+				}
+
+				this.addRemotePeerId(notification.sourcePeerId);
+				
 				if (this.raft.leaderId === this.localPeerId) {
 					this._sendEndpointNotification(notification.sourcePeerId, undefined);
 				}
-				this.addRemotePeerId(notification.sourcePeerId);
-
 				break;
 			}
 			case HamokMessageType.ENDPOINT_STATES_NOTIFICATION: {
@@ -1147,10 +1152,15 @@ export class Hamok<AppData extends Record<string, unknown> = Record<string, unkn
 					this.removeRemotePeerId(peerId);
 				}
 
+				let foundLocalPeerId = false;
+
 				for (const peerId of endpointStateNotification.activeEndpointIds ?? []) {
 					if (this.remotePeerIds.has(peerId)) continue;
-					if (peerId === this.localPeerId) continue;
-
+					if (peerId === this.localPeerId) {
+						foundLocalPeerId = true;
+						continue;
+					}
+					
 					logger.debug('%s Received endpoint state notification from %s (supposed to be the leader), and in that it has %s in its active endpoints, therefore we need to add it',
 						this.localPeerId,
 						endpointStateNotification.sourceEndpointId,
@@ -1164,6 +1174,16 @@ export class Hamok<AppData extends Record<string, unknown> = Record<string, unkn
 					this.addRemotePeerId(endpointStateNotification.sourceEndpointId);
 				}
 
+				if (!foundLocalPeerId) {
+					// we need to add the local peer id to the active endpoints of the leader
+
+					const joinMsg = this._codec.encodeJoinNotification(new JoinNotification(this.localPeerId, endpointStateNotification.sourceEndpointId));
+
+					this._emitMessage(joinMsg, endpointStateNotification.sourceEndpointId);
+
+					break;
+				}
+
 				// we add 2 becasue the nextIndex of the leader has not been reserved, and 
 				const possibleLowestIndex = endpointStateNotification.leaderNextIndex - endpointStateNotification.numberOfLogs + 2; 
 
@@ -1173,7 +1193,7 @@ export class Hamok<AppData extends Record<string, unknown> = Record<string, unkn
 				) {
 					// we make a warn message only if it is not the first join
 
-					logger.warn('%s Commit index of this peer (%d) is lower than the smallest commit index (%s) from remote peers resetting the logs', 
+					logger.warn('%s Commit index of this peer (%d) is lower than the smallest commit index (%d) from remote peers resetting the logs', 
 						this.localPeerId, 
 						this.raft.logs.commitIndex,
 						possibleLowestIndex
diff --git a/src/collections/HamokConnection.ts b/src/collections/HamokConnection.ts
index 9781d81..45155d6 100644
--- a/src/collections/HamokConnection.ts
+++ b/src/collections/HamokConnection.ts
@@ -250,7 +250,11 @@ export class HamokConnection<K, V> extends EventEmitter {
 			// 	message.type === HamokMessageType.INSERT_ENTRIES_REQUEST ? this.codec.valueCodec.decode(message.values[0]) : -1
 			// );
 			if (commitIndex <= this._appliedCommitIndex) {
-				return logger.warn('Received message with commit index %d is older or equal than the last applied commit index %d', commitIndex, this._appliedCommitIndex);
+				return logger.warn('Connection for id %s Received message with commit index %d is older or equal than the last applied commit index %d', 
+					this.config.storageId,
+					commitIndex, 
+					this._appliedCommitIndex
+				);
 			}
 			// only in test purposes
 			// if (this._appliedCommitIndex + 1 !== commitIndex) {
diff --git a/src/raft/MemoryStoredRaftLogs.ts b/src/raft/MemoryStoredRaftLogs.ts
index b8b932c..afccb19 100644
--- a/src/raft/MemoryStoredRaftLogs.ts
+++ b/src/raft/MemoryStoredRaftLogs.ts
@@ -279,7 +279,7 @@ export class MemoryStoredRaftLogs extends EventEmitter implements RaftLogs {
 		this._firstIndex = newCommitIndex;
 		this._memoryEstimateBytesLength = 0;
 
-		logger.debug(`Logs are reset. new values: commitIndex: ${this._commitIndex}, nextIndex: ${this._nextIndex}, lastApplied: ${this._firstIndex}`);
+		logger.warn(`Logs are reset. new values: commitIndex: ${this._commitIndex}, nextIndex: ${this._nextIndex}, lastApplied: ${this._firstIndex}`);
 	}
 
 	public removeUntil(newFirstIndex: number): void {