diff --git a/components/app.js b/components/app.js
index 32aed7d..9a9d5aa 100644
--- a/components/app.js
+++ b/components/app.js
@@ -693,7 +693,6 @@ export default class App extends Component {
 		case irc.RPL_INVITING:
 			channel = msg.params[2];
 			return [channel];
-		case irc.RPL_WELCOME:
 		case irc.RPL_YOURHOST:
 		case irc.RPL_MYINFO:
 		case irc.RPL_ISUPPORT:
diff --git a/components/buffer.js b/components/buffer.js
index a977dbc..6632481 100644
--- a/components/buffer.js
+++ b/components/buffer.js
@@ -186,6 +186,10 @@ class LogLine extends Component {
 				`;
 			}
 			break;
+		case irc.RPL_WELCOME:
+			let nick = msg.params[0];
+			content = html`Connected to server, your nickname is ${nick}`;
+			break;
 		case irc.RPL_INVITING:
 			invitee = msg.params[1];
 			content = html`${createNick(invitee)} has been invited to the channel`;