diff --git a/Mastodon/Scene/PickServer/TableViewCell/PickServerCell.swift b/Mastodon/Scene/PickServer/TableViewCell/PickServerCell.swift
index 58c6e8e27..d7deba29c 100644
--- a/Mastodon/Scene/PickServer/TableViewCell/PickServerCell.swift
+++ b/Mastodon/Scene/PickServer/TableViewCell/PickServerCell.swift
@@ -220,6 +220,15 @@ extension PickServerCell {
         let expandButtonTopConstraintInExpand = expandButton.topAnchor.constraint(equalTo: expandBox.bottomAnchor, constant: 8).priority(.required)
         expandConstraints.append(expandButtonTopConstraintInExpand)
         
+//        domainLabel.setContentHuggingPriority(.required - 1, for: .vertical)
+//        domainLabel.setContentCompressionResistancePriority(.required - 1, for: .vertical)
+//        descriptionLabel.setContentHuggingPriority(.required - 2, for: .vertical)
+//        descriptionLabel.setContentCompressionResistancePriority(.required - 2, for: .vertical)
+        domainLabel.setContentHuggingPriority(.required, for: .vertical)
+        domainLabel.setContentCompressionResistancePriority(.required, for: .vertical)
+        descriptionLabel.setContentHuggingPriority(.defaultHigh, for: .vertical)
+        descriptionLabel.setContentCompressionResistancePriority(.defaultHigh, for: .vertical)
+        
         NSLayoutConstraint.activate([
             // Set background view
             bgView.leadingAnchor.constraint(equalTo: contentView.readableContentGuide.leadingAnchor),
diff --git a/MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+Server.swift b/MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+Server.swift
index 098aa38dd..505ed730d 100644
--- a/MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+Server.swift
+++ b/MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+Server.swift
@@ -39,7 +39,7 @@ extension Mastodon.Entity {
         }
         
         public init(instance: Instance) {
-            self.domain = instance.title
+            self.domain = instance.uri
             self.version = instance.version ?? ""
             self.description = instance.shortDescription ?? instance.description
             self.language = instance.languages?.first ?? ""