diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt
index be2ccd8d052e9161a68de4d8d2c639e2c8de8c30..89ec4a464b62c82cf79ca1ea5e1785116610c54d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt
@@ -106,7 +106,7 @@ class ChatActivity : ServiceBoundActivity() {
             finish()
           } else {
             backendValue.connectUnlessConnected(
-              SocketAddress(account.host, account.port.toShort()),
+              SocketAddress(account.host, account.port),
               account.user,
               account.pass,
               true
diff --git a/lib/src/main/java/de/kuschku/libquassel/session/SocketAddress.kt b/lib/src/main/java/de/kuschku/libquassel/session/SocketAddress.kt
index 5b7685c76ebaccd74b30bdd963d37c273b263446..3f7214c598a7c37dddc3617a5daaffe761c30ba3 100644
--- a/lib/src/main/java/de/kuschku/libquassel/session/SocketAddress.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/session/SocketAddress.kt
@@ -2,6 +2,6 @@ package de.kuschku.libquassel.session
 
 import java.net.InetSocketAddress
 
-data class SocketAddress(val host: String, val port: Short) {
-  fun data() = InetSocketAddress(host, port.toInt())
+data class SocketAddress(val host: String, val port: Int) {
+  fun data() = InetSocketAddress(host, port)
 }