diff --git a/Shared/ViewModels/ConnectToServerViewModel.swift b/Shared/ViewModels/ConnectToServerViewModel.swift
index 9ca6fdd3..98f86de6 100644
--- a/Shared/ViewModels/ConnectToServerViewModel.swift
+++ b/Shared/ViewModels/ConnectToServerViewModel.swift
@@ -141,6 +141,7 @@ final class ConnectToServerViewModel: ViewModel, Eventful, Stateful {
 
         let formattedURL = url.trimmingCharacters(in: .whitespacesAndNewlines)
             .trimmingCharacters(in: .objectReplacement)
+            .trimmingCharacters(in: ["/"])
             .prepending("http://", if: !url.contains("://"))
 
         guard let url = URL(string: formattedURL) else { throw JellyfinAPIError("Invalid URL") }
@@ -200,6 +201,9 @@ final class ConnectToServerViewModel: ViewModel, Eventful, Stateful {
     }
 
     private func save(server: ServerState) async throws {
+
+        let publicInfo = try await server.getPublicSystemInfo()
+
         try dataStack.perform { transaction in
             let newServer = transaction.create(Into<ServerModel>())
 
@@ -210,8 +214,6 @@ final class ConnectToServerViewModel: ViewModel, Eventful, Stateful {
             newServer.users = []
         }
 
-        let publicInfo = try await server.getPublicSystemInfo()
-
         StoredValues[.Server.publicInfo(id: server.id)] = publicInfo
     }