diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/config/LoginServerManager.java b/libs/SalesforceSDK/src/com/salesforce/androidsdk/config/LoginServerManager.java
index e978af4e67..9ce5d4976c 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/config/LoginServerManager.java
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/config/LoginServerManager.java
@@ -226,14 +226,15 @@ public LoginServer getSelectedLoginServer() {
 
 			// Default to the first login server on the list.
 			if (!loginServers.isEmpty()) {
-				selectedServer.postValue(loginServers.get(0));
+				selectedLoginServer = loginServers.get(0);
+				selectedServer.postValue(selectedLoginServer);
 			}
 
 			// Store the selected login server.
-			setSelectedLoginServer(selectedServer.getValue());
+			setSelectedLoginServer(selectedLoginServer);
 		}
 
-		return selectedServer.getValue();
+		return selectedLoginServer;
 	}
 
 	/**
diff --git a/libs/test/SalesforceSDKTest/src/com/salesforce/androidsdk/auth/LoginServerManagerTest.kt b/libs/test/SalesforceSDKTest/src/com/salesforce/androidsdk/auth/LoginServerManagerTest.kt
index 900c0b83b6..ac3450b0cb 100644
--- a/libs/test/SalesforceSDKTest/src/com/salesforce/androidsdk/auth/LoginServerManagerTest.kt
+++ b/libs/test/SalesforceSDKTest/src/com/salesforce/androidsdk/auth/LoginServerManagerTest.kt
@@ -601,8 +601,8 @@ class LoginServerManagerMockTest {
 
         val sharedPreferences = mockk<SharedPreferences>(relaxed = true)
         every { sharedPreferences.getInt(NUMBER_OF_ENTRIES, 0) } returns 1
-        every { sharedPreferences.getString(String.format(SERVER_NAME, 0), null) } returns null
-        every { sharedPreferences.getString(String.format(SERVER_URL, 0), null) } returns null
+        every { sharedPreferences.getString(String.format(SERVER_NAME, 0), null) } returns "Production"
+        every { sharedPreferences.getString(String.format(SERVER_URL, 0), null) } returns "https://login.salesforce.com"
         every { sharedPreferences.getBoolean(String.format(IS_CUSTOM, 0), false) } returns false
 
         val context = mockk<Context>()