diff --git a/Channel/Channel.cpp b/Channel/Channel.cpp
index fe29fda..a71c934 100644
--- a/Channel/Channel.cpp
+++ b/Channel/Channel.cpp
@@ -48,7 +48,7 @@ void				Channel::removeMember(int fd)
     {
         if (this->members[i] == fd)
         {
-            members.erase(members.begin() + 1);
+            members.erase(members.begin() + i);
             return ;
         }
     }
diff --git a/commands/join.cpp b/commands/join.cpp
index 0580ff6..beb70af 100644
--- a/commands/join.cpp
+++ b/commands/join.cpp
@@ -6,7 +6,7 @@
 /*   By: aortigos <aortigos@student.42malaga.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2026/04/17 16:26:18 by aortigos          #+#    #+#             */
-/*   Updated: 2026/04/19 01:37:10 by aortigos         ###   ########.fr       */
+/*   Updated: 2026/04/19 11:28:29 by aortigos         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -34,7 +34,8 @@ void    Server::cmd_join(int fd, std::istringstream &ss)
 		std::string msg = "Channel created\r\n";
 		send(fd, msg.c_str(), msg.size(), 0);
 	} else {
-		channels[args].addMember(fd);
+		if (!channels[args].isMember(fd))
+			channels[args].addMember(fd);
 		
 		std::string msg = "Channel already exists\r\n";
 		send(fd, msg.c_str(), msg.size(), 0);
diff --git a/commands/privmsg.cpp b/commands/privmsg.cpp
index 574c4c8..2fc5997 100644
--- a/commands/privmsg.cpp
+++ b/commands/privmsg.cpp
@@ -6,7 +6,7 @@
 /*   By: aortigos <aortigos@student.42malaga.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2026/04/17 19:02:55 by aortigos          #+#    #+#             */
-/*   Updated: 2026/04/19 01:45:32 by aortigos         ###   ########.fr       */
+/*   Updated: 2026/04/19 11:39:04 by aortigos         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,8 +21,15 @@ void    Server::cmd_privmsg(int fd, std::istringstream &ss)
 	std::getline(ss, message);
 	message += "\r\n";
 
-	std::vector<int> members = channels[channel].getMembers();
+	if(channels.find(channel) == channels.end()
+		|| !channels[channel].isMember(fd))
+	{
+		std::string	msg = "No perteneces a ese canal\r\n";
+		send(fd, msg.c_str(), msg.size(), 0);
+		return ;
+	}
 
+	std::vector<int> members = channels[channel].getMembers();
 
 	// iterador para recorrer los miembros e ir enviandoles el mensaje
 	for (size_t i = 0; i < members.size(); i++)