diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/ProxyServicesSettingsScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/ProxyServicesSettingsScreen.kt
index 59c3fc32..27f19e69 100644
--- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/ProxyServicesSettingsScreen.kt
+++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/ProxyServicesSettingsScreen.kt
@@ -743,10 +743,11 @@ fun ProxyServicesSettingsScreen(
                 verticalAlignment = Alignment.CenterVertically,
             ) {
                 TextButton(onClick = {
+                    val proxyPort = proxyPort.text.toIntOrNull() ?: 80
                     sharedSettingsViewModel.checkConnection(
                         ManualProxy(
                             host = proxyHost.text,
-                            port = proxyPort.text.toInt(),
+                            port = proxyPort,
                             username = proxyUsername.text,
                             password = proxyPassword.text,
                         ),