diff --git a/Library/Environment.swift b/Library/Environment.swift
index 148ba13b3c..63993196dd 100644
--- a/Library/Environment.swift
+++ b/Library/Environment.swift
@@ -114,7 +114,7 @@ public struct Environment {
     environmentVariables: EnvironmentVariables = EnvironmentVariables(),
     is1PasswordSupported: @escaping () -> Bool = { ksr_is1PasswordSupported() },
     isVoiceOverRunning: @escaping () -> Bool = { UIAccessibility.isVoiceOverRunning },
-    koala: Koala = Koala(client: KoalaTrackingClient(endpoint: .production)),
+    koala: Koala = Koala(client: KoalaTrackingClient()),
     language: Language = Language(languageStrings: Locale.preferredLanguages) ?? Language.en,
     launchedCountries: LaunchedCountries = .init(),
     locale: Locale = .current,
diff --git a/Library/Koala/KoalaTrackingClient.swift b/Library/Koala/KoalaTrackingClient.swift
index 4db5662ed4..8fd04f593c 100644
--- a/Library/Koala/KoalaTrackingClient.swift
+++ b/Library/Koala/KoalaTrackingClient.swift
@@ -5,29 +5,22 @@ private let flushInterval = 60.0
 private let chunkSize = 4
 
 public final class KoalaTrackingClient: TrackingClientType {
-  fileprivate let endpoint: Endpoint
   fileprivate let URLSession: URLSession
   fileprivate let queue = DispatchQueue(label: "com.kickstarter.KoalaTrackingClient")
   fileprivate var buffer: [[String: Any]] = []
   fileprivate var timer: Timer?
   fileprivate var taskId = UIBackgroundTaskIdentifier.invalid
 
-  public enum Endpoint {
-    case staging
-    case production
-
-    var base: String {
-      switch self {
-      case .staging:
-        return Secrets.KoalaEndpoint.staging
-      case .production:
-        return Secrets.KoalaEndpoint.production
-      }
+  fileprivate var base: String {
+    switch AppEnvironment.current.environmentType {
+    case .production:
+      return Secrets.KoalaEndpoint.production
+    default:
+      return Secrets.KoalaEndpoint.staging
     }
   }
 
-  public init(endpoint: Endpoint = .production, URLSession: URLSession = .shared) {
-    self.endpoint = endpoint
+  public init(URLSession: URLSession = .shared) {
     self.URLSession = URLSession
 
     let notifications = NotificationCenter.default
@@ -130,7 +123,7 @@ public final class KoalaTrackingClient: TrackingClientType {
     if dataString.count >= 10_000 {
       print("🐨 [Koala Error]: Base64 payload is longer than 10,000 characters.")
     }
-    return URL(string: "\(self.endpoint.base)?data=\(dataString)")
+    return URL(string: "\(self.base)?data=\(dataString)")
   }
 
   fileprivate static func koalaRequest(_ url: URL) -> URLRequest {