diff --git a/Courier_iOS.podspec b/Courier_iOS.podspec
index e85a9734..f7658fd3 100644
--- a/Courier_iOS.podspec
+++ b/Courier_iOS.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
     s.name = 'Courier_iOS'
-    s.version = '3.4.0'
+    s.version = '3.4.1'
     s.summary = 'Courier makes it easy to add notifications to your app'
 
     s.homepage = 'https://github.com/trycourier/courier-ios'
diff --git a/Sources/Courier_iOS/Courier_iOS.swift b/Sources/Courier_iOS/Courier_iOS.swift
index 41669cde..7cd06059 100644
--- a/Sources/Courier_iOS/Courier_iOS.swift
+++ b/Sources/Courier_iOS/Courier_iOS.swift
@@ -29,7 +29,7 @@ import UIKit
     /**
      * Versioning
      */
-    internal static let version = "3.4.0"
+    internal static let version = "3.4.1"
     public static var agent = CourierAgent.native_ios
     
     /**
diff --git a/Sources/Courier_iOS/Modules/CoreAuth.swift b/Sources/Courier_iOS/Modules/CoreAuth.swift
index 2e847120..cd59caae 100644
--- a/Sources/Courier_iOS/Modules/CoreAuth.swift
+++ b/Sources/Courier_iOS/Modules/CoreAuth.swift
@@ -34,6 +34,13 @@ internal class CoreAuth {
         async let putTokens: () = push.putPushTokens()
         async let startInbox: () = inbox.startSoft()
         
+        if let tenantId = tenantId {
+            
+            // Add tenant to user
+            
+            
+        }
+        
         // Batch all functions together
         let _ = await [putTokens, startInbox]
         
diff --git a/Sources/Courier_iOS/Repositories/InboxRepository.swift b/Sources/Courier_iOS/Repositories/InboxRepository.swift
index 61f22980..9e8a65f5 100644
--- a/Sources/Courier_iOS/Repositories/InboxRepository.swift
+++ b/Sources/Courier_iOS/Repositories/InboxRepository.swift
@@ -123,15 +123,8 @@ internal class InboxRepository: Repository {
         let query = """
         query GetMessages(
             $params: FilterParamsInput = { status: "unread" }
-            $limit: Int = \(1)
-            $after: String
         ) {
             count(params: $params)
-            messages(params: $params, limit: $limit, after: $after) {
-                nodes {
-                    messageId
-                }
-            }
         }
         """
         
@@ -142,6 +135,7 @@ internal class InboxRepository: Repository {
             variables = """
             {
                 \"params\": {
+                    \"status\": \"unread\",
                     \"accountId\": \"\(tenantId)\"
                 }
             }