diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/WeatherManagerServiceBroker.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/WeatherManagerServiceBroker.java
index b7f1239b..83ce8015 100644
--- a/cm/lib/main/java/org/cyanogenmod/platform/internal/WeatherManagerServiceBroker.java
+++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/WeatherManagerServiceBroker.java
@@ -103,7 +103,7 @@ public class WeatherManagerServiceBroker extends BrokerableCMSystemService<ICMWe
 
     @Override
     protected ICMWeatherManager getDefaultImplementation() {
-        return null;
+        return new ICMWeatherManager.NoOp();
     }
 
     @Override