diff --git a/lib/src/views/chats/chat_list_view.dart b/lib/src/views/chats/chat_list_view.dart
index 55db6a7..0ab9637 100644
--- a/lib/src/views/chats/chat_list_view.dart
+++ b/lib/src/views/chats/chat_list_view.dart
@@ -32,14 +32,6 @@ class ChatListView extends StatefulWidget {
 }
 
 class _ChatListViewState extends State<ChatListView> {
-  late Stream<List<Contact>> contactListStream;
-
-  @override
-  void initState() {
-    super.initState();
-    contactListStream = twonlyDatabase.contactsDao.watchContactsForChatList();
-  }
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -94,7 +86,7 @@ class _ChatListViewState extends State<ChatListView> {
         ],
       ),
       body: StreamBuilder(
-        stream: contactListStream,
+        stream: twonlyDatabase.contactsDao.watchContactsForChatList(),
         builder: (context, snapshot) {
           if (!snapshot.hasData || snapshot.data == null) {
             return Container();
@@ -165,18 +157,12 @@ class _UserListItem extends State<UserListItem> {
   int lastMessageInSeconds = 0;
   MessageSendState state = MessageSendState.send;
   Message? currentMessage;
-  late Stream<List<Message>> lastMessageStream;
-  late Stream<List<Message>> notOpenedMessageStream;
 
   Timer? updateTime;
 
   @override
   void initState() {
     super.initState();
-    lastMessageStream =
-        twonlyDatabase.messagesDao.watchLastMessage(widget.user.userId);
-    notOpenedMessageStream =
-        twonlyDatabase.messagesDao.watchMessageNotOpened(widget.user.userId);
     lastUpdateTime();
   }
 
@@ -210,7 +196,8 @@ class _UserListItem extends State<UserListItem> {
       child: ListTile(
         title: Text(getContactDisplayName(widget.user)),
         subtitle: StreamBuilder(
-          stream: lastMessageStream,
+          stream:
+              twonlyDatabase.messagesDao.watchLastMessage(widget.user.userId),
           builder: (context, lastMessageSnapshot) {
             if (!lastMessageSnapshot.hasData) {
               return Container();
@@ -220,7 +207,8 @@ class _UserListItem extends State<UserListItem> {
             }
             final lastMessage = lastMessageSnapshot.data!.first;
             return StreamBuilder(
-              stream: notOpenedMessageStream,
+              stream: twonlyDatabase.messagesDao
+                  .watchMessageNotOpened(widget.user.userId),
               builder: (context, notOpenedMessagesSnapshot) {
                 if (!lastMessageSnapshot.hasData) {
                   return Container();