diff --git a/lib/bloc/characters/characters_bloc.dart b/lib/bloc/characters/characters_bloc.dart
index 3a7259dec..a47c389db 100644
--- a/lib/bloc/characters/characters_bloc.dart
+++ b/lib/bloc/characters/characters_bloc.dart
@@ -29,7 +29,7 @@ class CharactersBloc extends Bloc<CharactersEvent, CharactersState> {
     CharactersEvent event,
   ) async* {
     final s = event.map(
-      init: (_) => _buildInitialState(),
+      init: (_) => _buildInitialState(elementTypes: ElementType.values, weaponTypes: WeaponType.values),
       characterFilterTypeChanged: (e) => currentState.copyWith.call(tempCharacterFilterType: e.characterFilterType),
       elementTypeChanged: (e) {
         var types = <ElementType>[];
diff --git a/lib/bloc/weapons/weapons_bloc.dart b/lib/bloc/weapons/weapons_bloc.dart
index 67b05f6b8..f5fef77fb 100644
--- a/lib/bloc/weapons/weapons_bloc.dart
+++ b/lib/bloc/weapons/weapons_bloc.dart
@@ -28,7 +28,7 @@ class WeaponsBloc extends Bloc<WeaponsEvent, WeaponsState> {
     WeaponsEvent event,
   ) async* {
     final s = event.map(
-      init: (_) => _buildInitialState(),
+      init: (_) => _buildInitialState(weaponTypes: WeaponType.values),
       weaponFilterTypeChanged: (e) => currentState.copyWith.call(tempWeaponFilterType: e.filterType),
       rarityChanged: (e) => currentState.copyWith.call(tempRarity: e.rarity),
       sortDirectionTypeChanged: (e) => currentState.copyWith.call(tempSortDirectionType: e.sortDirectionType),