diff --git a/components/app.js b/components/app.js
index e4f8000..f6b4595 100644
--- a/components/app.js
+++ b/components/app.js
@@ -377,6 +377,11 @@ export default class App extends Component {
 			};
 			this.setBufferState(SERVER_BUFFER, { serverInfo });
 			break;
+		case irc.RPL_NOTOPIC:
+			var channel = msg.params[1];
+
+			this.setBufferState(channel, { topic: null });
+			break;
 		case irc.RPL_TOPIC:
 			var channel = msg.params[1];
 			var topic = msg.params[2];
diff --git a/lib/irc.js b/lib/irc.js
index 2026798..c8a3304 100644
--- a/lib/irc.js
+++ b/lib/irc.js
@@ -3,6 +3,7 @@ export const RPL_YOURHOST = "002";
 export const RPL_CREATED = "003";
 export const RPL_MYINFO = "004";
 export const RPL_ENDOFWHO = "315";
+export const RPL_NOTOPIC = "331";
 export const RPL_TOPIC = "332";
 export const RPL_WHOREPLY = "352";
 export const RPL_NAMREPLY = "353";