diff --git a/Sources/App/Onboarding/Screens/OnboardingManualURLViewController.swift b/Sources/App/Onboarding/Screens/OnboardingManualURLViewController.swift
index c36787ecfe..f8f3e321ba 100644
--- a/Sources/App/Onboarding/Screens/OnboardingManualURLViewController.swift
+++ b/Sources/App/Onboarding/Screens/OnboardingManualURLViewController.swift
@@ -166,6 +166,10 @@ class OnboardingManualURLViewController: UIViewController, UITextFieldDelegate {
 
         isConnecting = true
 
+        if let urlString = urlField.text {
+            urlField.text = removeTrailingSlash(from: urlString)
+        }
+
         let authentication = OnboardingAuth()
 
         firstly {
@@ -215,6 +219,14 @@ class OnboardingManualURLViewController: UIViewController, UITextFieldDelegate {
         }
     }
 
+    private func removeTrailingSlash(from string: String) -> String {
+        if string.hasSuffix("/") {
+            return String(string.dropLast())
+        } else {
+            return string
+        }
+    }
+
     private func promptForScheme(for string: String) -> Promise<String> {
         Promise { seal in
             let alert = UIAlertController(