diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ServerSignupDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ServerSignupDialog.java
index bcc9ae83..93381d33 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ServerSignupDialog.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ServerSignupDialog.java
@@ -103,8 +103,8 @@ public class ServerSignupDialog extends DialogFragment {
         serverName = Objects.requireNonNull(bind.serverNameTextView.getText()).toString().trim();
         username = Objects.requireNonNull(bind.usernameTextView.getText()).toString().trim();
         password = bind.lowSecurityCheckbox.isChecked() ? MusicUtil.passwordHexEncoding(Objects.requireNonNull(bind.passwordTextView.getText()).toString()) : Objects.requireNonNull(bind.passwordTextView.getText()).toString();
-        server = Objects.requireNonNull(bind.serverTextView.getText()).toString().trim();
-        localAddress = Objects.requireNonNull(bind.localAddressTextView.getText()).toString().trim();
+        server = bind.serverTextView.getText() != null && !bind.serverTextView.getText().toString().trim().isBlank() ? bind.serverTextView.getText().toString().trim() : null;
+        localAddress = bind.localAddressTextView.getText() != null && !bind.localAddressTextView.getText().toString().trim().isBlank() ? bind.localAddressTextView.getText().toString().trim() : null;
         lowSecurity = bind.lowSecurityCheckbox.isChecked();
 
         if (TextUtils.isEmpty(serverName)) {
diff --git a/app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt b/app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt
index 337fff06..5cbe9035 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt
+++ b/app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt
@@ -168,7 +168,9 @@ object Preferences {
 
     @JvmStatic
     fun getInUseServerAddress(): String? {
-        return App.getInstance().preferences.getString(IN_USE_SERVER_ADDRESS, getServer())
+        return App.getInstance().preferences.getString(IN_USE_SERVER_ADDRESS, null)
+            ?.takeIf { it.isNotBlank() }
+            ?: getServer()
     }
 
     @JvmStatic
@@ -186,7 +188,7 @@ object Preferences {
     fun isServerSwitchable(): Boolean {
         return App.getInstance().preferences.getLong(
                 NEXT_SERVER_SWITCH, 0
-        ) + 15000 < System.currentTimeMillis()
+        ) + 15000 < System.currentTimeMillis() && !getServer().isNullOrEmpty() && !getLocalAddress().isNullOrEmpty()
     }
 
     @JvmStatic