diff --git a/src/Channel.cpp b/src/Channel.cpp
index f2039ae..9d72168 100644
--- a/src/Channel.cpp
+++ b/src/Channel.cpp
@@ -193,10 +193,6 @@ std::vector<User *> Channel::getOperators() const {
 std::vector<User *> Channel::getAllUsers() const {
     std::vector<User *> allUsers = this->_operators;
     allUsers.insert(allUsers.end(), this->_users.begin(), this->_users.end());
-	for (size_t i = 0; i < allUsers.size(); i++) {
-		std::cout << allUsers[i]->getFd() << std::endl;
-		std::cout << allUsers[i]->getNickname() << std::endl;
-	}
     return allUsers;
 }
 
diff --git a/src/commands/TopicCommand.cpp b/src/commands/TopicCommand.cpp
index 51d82d3..34fc554 100644
--- a/src/commands/TopicCommand.cpp
+++ b/src/commands/TopicCommand.cpp
@@ -48,8 +48,10 @@ void TopicCommand::execute(int clientFd) {
             )
         );
     } else {
-        const std::string &message = _topic.empty() ? NoTopicResponse(nickname, channelName).getReply()
-                                                    : TopicResponse(nickname, channelName, _topic).getReply();
+        const std::string &channelTopic = _channel->getTopic();
+        const std::string &message = channelTopic.empty()
+            ? NoTopicResponse(nickname, channelName).getReply()
+            : TopicResponse(nickname, channelName, channelTopic).getReply();
         Logger::debug("Sending topic to user " + nickname);
         server.sendMessage(clientFd, message);
     }