diff --git a/lib/chat_list/cubits/active_conversations_bloc_map_cubit.dart b/lib/chat_list/cubits/active_conversations_bloc_map_cubit.dart
index 7f67f10..8212331 100644
--- a/lib/chat_list/cubits/active_conversations_bloc_map_cubit.dart
+++ b/lib/chat_list/cubits/active_conversations_bloc_map_cubit.dart
@@ -46,7 +46,7 @@ class ActiveConversationsBlocMapCubit extends BlocMapCubit<TypedKey,
         _contactListCubit = contactListCubit;
 
   // Add an active conversation to be tracked for changes
-  Future<void> addConversation({required proto.Contact contact}) async =>
+  Future<void> _addConversation({required proto.Contact contact}) async =>
       add(() => MapEntry(
           contact.remoteConversationRecordKey.toVeilid(),
           TransformerCubit(
@@ -103,7 +103,7 @@ class ActiveConversationsBlocMapCubit extends BlocMapCubit<TypedKey,
       return;
     }
     final contact = contactList[contactIndex];
-    await addConversation(contact: contact);
+    await _addConversation(contact: contact);
   }
 
   ////
diff --git a/packages/bloc_tools/lib/src/state_follower.dart b/packages/bloc_tools/lib/src/state_follower.dart
index 9ae3fee..cc955b3 100644
--- a/packages/bloc_tools/lib/src/state_follower.dart
+++ b/packages/bloc_tools/lib/src/state_follower.dart
@@ -18,7 +18,8 @@ abstract mixin class StateFollower<S extends Object, K, V> {
     required Stream<S> stream,
   }) {
     //
-    _lastInputStateMap = getStateMap(initialInputState);
+    _lastInputStateMap = IMap();
+    _updateFollow(initialInputState);
     _subscription = stream.listen(_updateFollow);
   }