diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index a955f15083..7a2f8c2852 100644
--- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -57,8 +57,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/matrix-org/emojibase-bindings",
       "state" : {
-        "revision" : "603693b5909e98e9a616420cbdf7a357828ab030",
-        "version" : "1.0.0"
+        "revision" : "6ca06fefac9329fece851a2a4df7979b1699970a",
+        "version" : "1.0.5"
       }
     },
     {
diff --git a/ElementX/Sources/Other/UserAgentBuilder.swift b/ElementX/Sources/Other/UserAgentBuilder.swift
index 6da7a70b46..aacf7ed398 100644
--- a/ElementX/Sources/Other/UserAgentBuilder.swift
+++ b/ElementX/Sources/Other/UserAgentBuilder.swift
@@ -22,8 +22,8 @@ import DeviceKit
 #endif
 
 final class UserAgentBuilder {
-    class func makeASCIIUserAgent() -> String? {
-        makeUserAgent()?.asciified()
+    class func makeASCIIUserAgent() -> String {
+        makeUserAgent()?.asciified() ?? "unknown"
     }
     
     private class func makeUserAgent() -> String? {
diff --git a/ElementX/Sources/Services/UserSession/UserSessionStore.swift b/ElementX/Sources/Services/UserSession/UserSessionStore.swift
index 35e1491af0..9faf680d42 100644
--- a/ElementX/Sources/Services/UserSession/UserSessionStore.swift
+++ b/ElementX/Sources/Services/UserSession/UserSessionStore.swift
@@ -114,7 +114,7 @@ class UserSessionStore: UserSessionStoreProtocol {
             .basePath(path: baseDirectory.path)
             .username(username: credentials.userID)
             .homeserverUrl(url: credentials.restorationToken.session.homeserverUrl)
-            .userAgent(userAgent: UserAgentBuilder.makeASCIIUserAgent() ?? "unknown")
+            .userAgent(userAgent: UserAgentBuilder.makeASCIIUserAgent())
             .serverVersions(versions: ["v1.0", "v1.1", "v1.2", "v1.3", "v1.4", "v1.5"]) // FIXME: Quick and dirty fix for stopping version requests on startup https://github.com/matrix-org/matrix-rust-sdk/pull/1376
 
         do {
diff --git a/NSE/Sources/Other/NSEUserSession.swift b/NSE/Sources/Other/NSEUserSession.swift
index ac21f1b81a..f64f771460 100644
--- a/NSE/Sources/Other/NSEUserSession.swift
+++ b/NSE/Sources/Other/NSEUserSession.swift
@@ -30,7 +30,7 @@ final class NSEUserSession {
         baseClient = try ClientBuilder()
             .basePath(path: URL.sessionsBaseDirectory.path)
             .username(username: credentials.userID)
-            .userAgent(userAgent: UserAgentBuilder.makeASCIIUserAgent() ?? "unknown")
+            .userAgent(userAgent: UserAgentBuilder.makeASCIIUserAgent())
             .build()
 
         try baseClient.restoreSession(session: credentials.restorationToken.session)