2 files changed, 9 insertions, 0 deletions
diff --git a/src/TopRoomBar.cc b/src/TopRoomBar.cc
index dc597bc9..d34e59ad 100644
--- a/src/TopRoomBar.cc
+++ b/src/TopRoomBar.cc
@@ -144,6 +144,9 @@ TopRoomBar::TopRoomBar(QWidget *parent)
         menu_->addAction(leaveRoom_);
 
         connect(settingsBtn_, &QPushButton::clicked, this, [=]() {
+                if (roomSettings_.isNull())
+                        return;
+
                 if (roomSettings_->isNotificationsEnabled())
                         toggleNotifications_->setText(tr("Disable notifications"));
                 else
diff --git a/src/timeline/TimelineViewManager.cc b/src/timeline/TimelineViewManager.cc
index 0a81b06b..7318ce2b 100644
--- a/src/timeline/TimelineViewManager.cc
+++ b/src/timeline/TimelineViewManager.cc
@@ -68,6 +68,9 @@ TimelineViewManager::messageSendFailed(const QString &roomid, int txn_id)
 void
 TimelineViewManager::queueTextMessage(const QString &msg)
 {
+        if (active_room_.isEmpty())
+                return;
+
         auto room_id = active_room_;
         auto view    = views_[room_id];
 
@@ -77,6 +80,9 @@ TimelineViewManager::queueTextMessage(const QString &msg)
 void
 TimelineViewManager::queueEmoteMessage(const QString &msg)
 {
+        if (active_room_.isEmpty())
+                return;
+
         auto room_id = active_room_;
         auto view    = views_[room_id];