diff --git a/MediaBrowser.Common/Extensions/HttpContextExtensions.cs b/MediaBrowser.Common/Extensions/HttpContextExtensions.cs
index 76db688854..e3ad67a4ad 100644
--- a/MediaBrowser.Common/Extensions/HttpContextExtensions.cs
+++ b/MediaBrowser.Common/Extensions/HttpContextExtensions.cs
@@ -28,9 +28,10 @@ namespace MediaBrowser.Common.Extensions
         /// <returns>The remote caller IP address.</returns>
         public static string RemoteIp(this HttpRequest request)
         {
-            if (string.IsNullOrEmpty(request.HttpContext.Items["RemoteIp"].ToString()))
+            var cachedRemoteIp = request.HttpContext.Items["RemoteIp"].ToString();
+            if (string.IsNullOrEmpty(cachedRemoteIp))
             {
-                return request.HttpContext.Items["RemoteIp"].ToString();
+                return cachedRemoteIp;
             }
 
             IPAddress ip;