1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/cyngn/theme/chooser/ThemeFragment.java b/src/com/cyngn/theme/chooser/ThemeFragment.java
index 103dca0..085b23a 100644
--- a/src/com/cyngn/theme/chooser/ThemeFragment.java
+++ b/src/com/cyngn/theme/chooser/ThemeFragment.java
@@ -2265,7 +2265,11 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb
             builder.setComponent(component, componentMap.get(component));
         }
         builder.setRequestType(requestType);
-        if (mThemeVersion >= 3) builder.setWallpaperId(mSelectedWallpaperComponentId);
+        if (mThemeVersion >= 3)  {
+            builder.setWallpaperId(mSelectedWallpaperComponentId != null
+                    ? mSelectedWallpaperComponentId
+                    : DEFAULT_COMPONENT_ID);
+        }
         return builder.build();
     }