diff --git a/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ExtensionSaveService.swift b/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ExtensionSaveService.swift
index c793b93b2..c262936e3 100644
--- a/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ExtensionSaveService.swift
+++ b/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ExtensionSaveService.swift
@@ -56,7 +56,7 @@ extension ShareExtensionViewModel {
     }
   }
 
-  func createPage(services: Services, pageScrapePayload: PageScrapePayload) async -> Bool {
+  func createPage(pageScrapePayload: PageScrapePayload) async -> Bool {
     var newRequestID: String?
 
     do {
@@ -112,7 +112,6 @@ extension ShareExtensionViewModel {
 }
 
 final class SaveOperation: Operation, URLSessionDelegate {
-  let services: Services
   let pageScrapePayload: PageScrapePayload
   let shareExtensionViewModel: ShareExtensionViewModel
 
@@ -130,7 +129,6 @@ final class SaveOperation: Operation, URLSessionDelegate {
     self.shareExtensionViewModel = shareExtensionViewModel
 
     self.state = .created
-    self.services = Services()
   }
 
   public var state: State = .created {
@@ -171,7 +169,6 @@ final class SaveOperation: Operation, URLSessionDelegate {
 
     Task {
       let pageCreated = await shareExtensionViewModel.createPage(
-        services: services,
         pageScrapePayload: pageScrapePayload
       )
       if pageCreated {
diff --git a/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ShareExtensionViewModel.swift b/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ShareExtensionViewModel.swift
index 76c1e2ea9..d9a2b24eb 100644
--- a/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ShareExtensionViewModel.swift
+++ b/apple/OmnivoreKit/Sources/App/AppExtensions/Share/ShareExtensionViewModel.swift
@@ -11,10 +11,7 @@ public class ShareExtensionViewModel: ObservableObject {
   @Published public var requestId = UUID().uuidString.lowercased()
   @Published var debugText: String?
 
-  #if os(macOS)
-    let services = Services()
-  #endif
-
+  let services = Services()
   let queue = OperationQueue()
 
   func handleReadNowAction(extensionContext: NSExtensionContext?) {
diff --git a/apple/OmnivoreKit/Sources/Services/Keychain/ValetKey.swift b/apple/OmnivoreKit/Sources/Services/Keychain/ValetKey.swift
index e359a9411..e4daea999 100644
--- a/apple/OmnivoreKit/Sources/Services/Keychain/ValetKey.swift
+++ b/apple/OmnivoreKit/Sources/Services/Keychain/ValetKey.swift
@@ -6,6 +6,10 @@ public enum PublicValet {
   public static var storedAppEnvironment: AppEnvironment? {
     ValetKey.appEnvironmentString.value().flatMap { AppEnvironment(rawValue: $0) }
   }
+
+  public static var authToken: String? {
+    ValetKey.authToken.value()
+  }
 }
 
 enum ValetKey: String {
diff --git a/apple/Sources/SafariExtension/SafariWebExtensionHandler.swift b/apple/Sources/SafariExtension/SafariWebExtensionHandler.swift
index b3367f6e2..307197fe9 100644
--- a/apple/Sources/SafariExtension/SafariWebExtensionHandler.swift
+++ b/apple/Sources/SafariExtension/SafariWebExtensionHandler.swift
@@ -8,15 +8,14 @@
 import App
 import os.log
 import SafariServices
+import Services
 
 let SFExtensionMessageKey = "message"
 
 class SafariWebExtensionHandler: NSObject, NSExtensionRequestHandling {
-  let services = Services()
-
   func beginRequest(with context: NSExtensionContext) {
     let response = NSExtensionItem()
-    let authToken = services.authenticator.authToken
+    let authToken = PublicValet.authToken
     response.userInfo = [SFExtensionMessageKey: ["authToken": authToken]]
     context.completeRequest(returningItems: [response], completionHandler: nil)
   }