diff --git a/MediaBrowser.Controller/Weather/WeatherClient.cs b/MediaBrowser.Controller/Weather/WeatherClient.cs
index e2aada34f..c4abdc171 100644
--- a/MediaBrowser.Controller/Weather/WeatherClient.cs
+++ b/MediaBrowser.Controller/Weather/WeatherClient.cs
@@ -31,6 +31,11 @@ namespace MediaBrowser.Controller.Weather
 
         public async Task<WeatherInfo> GetWeatherInfoAsync(string zipCode)
         {
+            if (string.IsNullOrWhiteSpace(zipCode))
+            {
+                return null;
+            }
+
             int numDays = 5;
             string apiKey = "24902f60f1231941120109";