diff --git a/Session/Home/HomeVC.swift b/Session/Home/HomeVC.swift
index b197fe40f..04994c47e 100644
--- a/Session/Home/HomeVC.swift
+++ b/Session/Home/HomeVC.swift
@@ -398,7 +398,7 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, UIViewC
                 let groupID = thread.groupModel.groupId
                 let groupPublicKey = LKGroupUtilities.getDecodedGroupID(groupID)
                 do {
-                    try MessageSender.v2_leave(groupPublicKey, using: transaction)
+                    try MessageSender.leave(groupPublicKey, using: transaction)
                 } catch {
                     // TODO: Handle
                 }
diff --git a/SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift b/SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift
index 08ebce7d5..4d4723047 100644
--- a/SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift	
+++ b/SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift	
@@ -13,8 +13,8 @@ public final class ClosedGroupControlMessage : ControlMessage {
     
     public override var isSelfSendValid: Bool {
         switch kind {
-        case .update, .encryptionKeyPair, .nameChange, .membersAdded, .membersRemoved, .memberLeft: return true
-        default: return false
+        case .new: return false
+        default: return true
         }
     }