diff --git a/components/app.js b/components/app.js
index 91b0496..fbe0b83 100644
--- a/components/app.js
+++ b/components/app.js
@@ -530,6 +530,10 @@ export default class App extends Component {
 					target = msg.prefix.name;
 				}
 			}
+			if (msg.command === "NOTICE" && !State.getBuffer(this.state, { server: serverID, name: target })) {
+				// Don't open a new buffer if this is just a NOTICE
+				target = SERVER_BUFFER;
+			}
 
 			var allowedPrefixes = client.isupport.get("STATUSMSG");
 			if (allowedPrefixes) {