diff --git a/samples/MicroserviceDemo/applications/ConsoleClientDemo/ClientDemoService.cs b/samples/MicroserviceDemo/applications/ConsoleClientDemo/ClientDemoService.cs
index 4066e21156..eb1197ffc7 100644
--- a/samples/MicroserviceDemo/applications/ConsoleClientDemo/ClientDemoService.cs
+++ b/samples/MicroserviceDemo/applications/ConsoleClientDemo/ClientDemoService.cs
@@ -51,15 +51,17 @@ namespace ConsoleClientDemo
                 {
                     await _authenticator.AuthenticateAsync(client);
 
-                    var response = await client.GetAsync(_remoteServiceOptions.RemoteServices.Default.BaseUrl.EnsureEndsWith('/') + "Test/Index");
+                    var url = GetServerUrl() + "Test/Index";
+                    var response = await client.GetAsync(url);
+
                     if (!response.IsSuccessStatusCode)
                     {
                         Console.WriteLine(response.StatusCode);
                     }
                     else
                     {
-                        var content = await response.Content.ReadAsStringAsync();
-                        Console.WriteLine(content);
+                        var responseContent = await response.Content.ReadAsStringAsync();
+                        Console.WriteLine(responseContent);
                     }
                 }
             }
@@ -125,5 +127,10 @@ namespace ConsoleClientDemo
                 Console.WriteLine(e);
             }
         }
+
+        private string GetServerUrl()
+        {
+            return _remoteServiceOptions.RemoteServices.Default.BaseUrl.EnsureEndsWith('/');
+        }
     }
 }
\ No newline at end of file