diff --git a/services/java/com/android/server/WallpaperManagerService.java b/services/java/com/android/server/WallpaperManagerService.java
index 0a313966859a8..9a293a97b89a5 100644
--- a/services/java/com/android/server/WallpaperManagerService.java
+++ b/services/java/com/android/server/WallpaperManagerService.java
@@ -325,8 +325,10 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
             ComponentName realName = name;
             if (realName == null) {
                 // The default component is our static image wallpaper.
-                realName = new ComponentName("android",
-                        ImageWallpaper.class.getName());
+                //realName = new ComponentName("android",
+                //        ImageWallpaper.class.getName());
+                clearWallpaperComponentLocked();
+                return;
             }
             ServiceInfo si = mContext.getPackageManager().getServiceInfo(realName,
                     PackageManager.GET_META_DATA | PackageManager.GET_PERMISSIONS);