diff --git a/Signal/src/Loki/Components/FriendRequestView.swift b/Signal/src/Loki/Components/FriendRequestView.swift
index 750dd886e..1854a3c61 100644
--- a/Signal/src/Loki/Components/FriendRequestView.swift
+++ b/Signal/src/Loki/Components/FriendRequestView.swift
@@ -114,7 +114,7 @@ final class FriendRequestView : UIView {
         let format: String?
         switch kind {
         case .incoming:
-            buttonStackView.isHidden = friendRequestStatus != .received
+            buttonStackView.isHidden = (friendRequestStatus != .received)
             spacer2.isHidden = buttonStackView.isHidden
             switch friendRequestStatus {
             case .none: format = NSLocalizedString("You've declined %@'s session request", comment: "")
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
index 40cf4a619..1b35b058e 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
@@ -227,6 +227,7 @@ NS_ASSUME_NONNULL_BEGIN
         ]];
     } else {
         [self.friendRequestView removeFromSuperview];
+        self.friendRequestView = nil;
         [self.messageBubbleViewBottomConstraint setActive:YES];
     }