diff --git a/SignalMessaging/environment/AppSetup.m b/SignalMessaging/environment/AppSetup.m
index 65366346b..95cb73456 100644
--- a/SignalMessaging/environment/AppSetup.m
+++ b/SignalMessaging/environment/AppSetup.m
@@ -128,7 +128,7 @@ NS_ASSUME_NONNULL_BEGIN
         
         // Loki
         OWSLokiFriendRequestExpireJob *lokiFriendRequestExpireJob = [[OWSLokiFriendRequestExpireJob alloc] initWithPrimaryStorage:primaryStorage];
-        [SSKEnvironment.shared setLokiFriendRequestExpireJob:lokiFriendRequestExpireJob];
+        SSKEnvironment.shared.lokiFriendRequestExpireJob = lokiFriendRequestExpireJob;
 
         appSpecificSingletonBlock();
 
diff --git a/SignalServiceKit/src/Loki/Utilities/FriendRequestExpireJob.swift b/SignalServiceKit/src/Loki/Utilities/FriendRequestExpireJob.swift
index 4e701f8fc..eeb65e07f 100644
--- a/SignalServiceKit/src/Loki/Utilities/FriendRequestExpireJob.swift
+++ b/SignalServiceKit/src/Loki/Utilities/FriendRequestExpireJob.swift
@@ -4,10 +4,10 @@
  */
 
 @objc(OWSLokiFriendRequestExpireJob)
-public class FriendRequestExpireJob: NSObject {
+public class FriendRequestExpireJob : NSObject {
     
     private let databaseConnection: YapDatabaseConnection
-    private let messageFinder: FriendRequestExpireMessageFinder
+    private let messageFinder = FriendRequestExpireMessageFinder()
     
     // These three properties should only be accessed on the main thread.
     private var hasStarted = false
@@ -16,9 +16,7 @@ public class FriendRequestExpireJob: NSObject {
     private var nextExpireDate: Date?
     
     // Our queue
-    public static var serialQueue: DispatchQueue = {
-        return DispatchQueue(label: "network.loki.friendrequest.expire")
-    }()
+    public static let serialQueue = DispatchQueue(label: "network.loki.friendrequest.expire")
     
     /// Create a `FriendRequestExpireJob`.
     /// This will create a auto-running job which will set friend requests to expired.
@@ -26,7 +24,6 @@ public class FriendRequestExpireJob: NSObject {
     /// - Parameter primaryStorage: The primary storage.
     @objc public init(withPrimaryStorage primaryStorage: OWSPrimaryStorage) {
         databaseConnection = primaryStorage.newDatabaseConnection()
-        messageFinder = FriendRequestExpireMessageFinder()
         super.init()
         
         // This makes sure we only ever have one instance of this class
diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m
index 5a60534de..f7651f553 100644
--- a/SignalServiceKit/src/Messages/OWSMessageSender.m
+++ b/SignalServiceKit/src/Messages/OWSMessageSender.m
@@ -1119,7 +1119,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
             // ========
             if (messageType == TSFriendRequestMessageType) {
                 [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
-                    [message.thread setFriendRequestStatus:TSThreadFriendRequestStatusRequestSent withTransaction:transaction];
+                    [message.thread saveFriendRequestStatus:TSThreadFriendRequestStatusRequestSent withTransaction:transaction];
                     [message.thread removeOutgoingFriendRequestMessagesWithTransaction:transaction];
                     
                     // We also want to expire the message after 72 hours