diff --git a/app/src/main/java/com/cappielloantonio/tempo/subsonic/api/system/SystemClient.java b/app/src/main/java/com/cappielloantonio/tempo/subsonic/api/system/SystemClient.java
index c5227da7..f237b683 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/subsonic/api/system/SystemClient.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/subsonic/api/system/SystemClient.java
@@ -24,13 +24,15 @@ public class SystemClient {
 
     public Call<ApiResponse> ping() {
         Log.d(TAG, "ping()");
+        int timeoutSeconds = Preferences.getNetworkPingTimeout();
         Call<ApiResponse> pingCall = systemService.ping(subsonic.getParams());
         if (Preferences.isInUseServerAddressLocal()) {
             pingCall.timeout()
-                    .timeout(1, TimeUnit.SECONDS);
+                    .timeout(timeoutSeconds, TimeUnit.SECONDS);
         } else {
+            int finalTimeout = Math.min(timeoutSeconds * 2, 10);
             pingCall.timeout()
-                    .timeout(3, TimeUnit.SECONDS);
+                    .timeout(finalTimeout, TimeUnit.SECONDS);
         }
         return pingCall;
     }
diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/SettingsFragment.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/SettingsFragment.java
index bbbdecc2..aab61593 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/SettingsFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/SettingsFragment.java
@@ -9,6 +9,8 @@ import android.media.audiofx.AudioEffect;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
+import android.text.InputFilter;
+import android.text.InputType;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -27,6 +29,7 @@ import androidx.media3.common.util.UnstableApi;
 import androidx.navigation.NavController;
 import androidx.navigation.NavOptions;
 import androidx.navigation.fragment.NavHostFragment;
+import androidx.preference.EditTextPreference;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
@@ -141,6 +144,7 @@ public class SettingsFragment extends PreferenceFragmentCompat {
         setStreamingCacheSize();
         setAppLanguage();
         setVersion();
+        setNetorkPingTimeoutBase();
 
         actionLogout();
         actionScan();
@@ -261,6 +265,30 @@ public class SettingsFragment extends PreferenceFragmentCompat {
         }
     }
 
+    private void setNetorkPingTimeoutBase() {
+        EditTextPreference networkPingTimeoutBase = findPreference("network_ping_timeout_base");
+
+        if (networkPingTimeoutBase != null) {
+            networkPingTimeoutBase.setSummaryProvider(EditTextPreference.SimpleSummaryProvider.getInstance());
+            networkPingTimeoutBase.setOnBindEditTextListener(editText -> {
+                editText.setInputType(InputType.TYPE_CLASS_NUMBER);
+                editText.setFilters(new InputFilter[]{ (source, start, end, dest, dstart, dend) -> {
+                    for (int i = start; i < end; i++) {
+                        if (!Character.isDigit(source.charAt(i))) {
+                            return "";
+                        }
+                    }
+                    return null;
+            }});
+        });
+
+        networkPingTimeoutBase.setOnPreferenceChangeListener((preference, newValue) -> {
+            String input = (String) newValue;
+            return input != null && !input.isEmpty();
+        });
+        }
+    }
+
     private void setStreamingCacheSize() {
         ListPreference streamingCachePreference = findPreference("streaming_cache_size");
 
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 14e33e39..485aa587 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt
+++ b/app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt
@@ -85,6 +85,8 @@ object Preferences {
     private const val ARTIST_SORT_BY_ALBUM_COUNT= "artist_sort_by_album_count"
     private const val SORT_SEARCH_CHRONOLOGICALLY= "sort_search_chronologically"
     private const val ARTIST_DISPLAY_BIOGRAPHY= "artist_display_biography"
+    private const val NETWORK_PING_TIMEOUT = "network_ping_timeout_base"
+    
 
     @JvmStatic
     fun getServer(): String? {
@@ -96,6 +98,19 @@ object Preferences {
         App.getInstance().preferences.edit().putString(SERVER, server).apply()
     }
 
+    @JvmStatic
+    fun getNetworkPingTimeout(): Int {
+        val timeoutString = App.getInstance().preferences.getString(NETWORK_PING_TIMEOUT, "2") ?: "2"
+        return (timeoutString.toIntOrNull() ?: 2).coerceAtLeast(1)
+    }
+
+    @JvmStatic
+    fun setNetworkPingTimeout(pingTimeout: String?) {
+        App.getInstance().preferences.edit().putString(NETWORK_PING_TIMEOUT, pingTimeout).apply()
+    }
+
+    
+
     @JvmStatic
     fun getUser(): String? {
         return App.getInstance().preferences.getString(USER, null)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ff7840c7..4fc8da67 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -353,6 +353,9 @@
     <string name="settings_image_size">Set image resolution</string>
     <string name="settings_language">Language</string>
     <string name="settings_logout_title">Log out</string>
+    <string name="settings_ping_timeout_title">Server Ping Timeout</string>
+    <string name="settings_ping_timeout_summary">Set Local URL timeout. Default 2 seconds. (Remote server will use this value x3 up to 10 seconds max.)</string>
+    <string name="settings_ping_timeout_dialog">Set base timeout in seconds.</string>
     <string name="settings_max_bitrate_download">Bitrate for downloads</string>
     <string name="settings_max_bitrate_mobile">Bitrate in mobile</string>
     <string name="settings_max_bitrate_wifi">Bitrate in Wi-Fi</string>
diff --git a/app/src/main/res/xml/global_preferences.xml b/app/src/main/res/xml/global_preferences.xml
index fdf6938a..b992b961 100644
--- a/app/src/main/res/xml/global_preferences.xml
+++ b/app/src/main/res/xml/global_preferences.xml
@@ -17,6 +17,15 @@
             android:key="scan_library"
             android:title="@string/settings_scan_title" />
 
+        <EditTextPreference
+            android:key="network_ping_timeout_base"
+            android:title="@string/settings_ping_timeout_title"
+            app:summary="@string/settings_ping_timeout_summary"
+            android:dialogTitle="@string/settings_ping_timeout_dialog"
+            android:inputType="number"
+            android:singleLine="true"
+            android:defaultValue="2" />
+
         <Preference
             android:key="logout"
             android:title="@string/settings_logout_title"/>