diff --git a/SessionMessagingKit/Open Groups/OpenGroupManagerV2.swift b/SessionMessagingKit/Open Groups/OpenGroupManagerV2.swift
index 248c16069..ef4688cbb 100644
--- a/SessionMessagingKit/Open Groups/OpenGroupManagerV2.swift	
+++ b/SessionMessagingKit/Open Groups/OpenGroupManagerV2.swift	
@@ -31,7 +31,9 @@ public final class OpenGroupManagerV2 : NSObject {
     // MARK: Adding & Removing
     
     public func hasExistingOpenGroup(room: String, server: String, publicKey: String, using transaction: YapDatabaseReadWriteTransaction) -> Bool {
-        let schemeFreeServer: String = (server.starts(with: "https://") ? server.substring(from: "https://".count) : server.substring(from: "http://".count))
+        guard let serverUrl: URL = URL(string: server) else { return false }
+        
+        let schemeFreeServer: String = (serverUrl.host ?? server)
         let schemeFreeDefaultServer: String = OpenGroupAPIV2.defaultServer.substring(from: "http://".count)
         var serverOptions: Set<String> = Set([
             schemeFreeServer,