diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 2bc6522232..0c4688a411 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -434,7 +434,10 @@ const LoggedInView = React.createClass({
         }
 
         const usageLimitEvent = this.state.serverNoticeEvents.find((e) => {
-            return e && e.getType() === 'm.server_notice.usage_limit_reached';
+            return (
+                e && e.getType() === 'm.room.message' &&
+                e.getContent()['server_notice_type'] === 'm.server_notice.usage_limit_reached'
+            );
         });
 
         let topBar;