diff --git a/packages/stream_chat/analysis_options.yaml b/packages/stream_chat/analysis_options.yaml
index 7e4b00fa..26001160 100644
--- a/packages/stream_chat/analysis_options.yaml
+++ b/packages/stream_chat/analysis_options.yaml
@@ -44,7 +44,6 @@ linter:
     - avoid_private_typedef_functions
     - avoid_redundant_argument_values
     - avoid_return_types_on_setters
-    - avoid_returning_null
     - avoid_returning_null_for_void
     - avoid_shadowing_type_parameters
     - avoid_single_cascade_in_expression_statements
diff --git a/packages/stream_chat/lib/src/api/channel.dart b/packages/stream_chat/lib/src/api/channel.dart
index 52b748d4..87bb942b 100644
--- a/packages/stream_chat/lib/src/api/channel.dart
+++ b/packages/stream_chat/lib/src/api/channel.dart
@@ -1209,6 +1209,7 @@ class ChannelClientState {
   ChannelClientState(
     this._channel,
     ChannelState channelState,
+    // ignore: unnecessary_parenthesis
   ) : _debouncedUpdatePersistenceChannelState = ((ChannelState state) {
           _channel?._client?.chatPersistenceClient?.updateChannelState(state);
         }).debounced(const Duration(seconds: 1)) {
diff --git a/packages/stream_chat_persistence/lib/src/db/moor_chat_database.dart b/packages/stream_chat_persistence/lib/src/db/moor_chat_database.dart
index af409b70..65686cb1 100644
--- a/packages/stream_chat_persistence/lib/src/db/moor_chat_database.dart
+++ b/packages/stream_chat_persistence/lib/src/db/moor_chat_database.dart
@@ -1,10 +1,9 @@
 import 'package:moor/moor.dart';
 import 'package:stream_chat/stream_chat.dart';
-
-import '../converter/converter.dart';
-import '../dao/dao.dart';
-import '../entity/entity.dart';
-import 'shared/shared_db.dart';
+import 'package:stream_chat_persistence/src/converter/converter.dart';
+import 'package:stream_chat_persistence/src/dao/dao.dart';
+import 'package:stream_chat_persistence/src/db/shared/shared_db.dart';
+import 'package:stream_chat_persistence/src/entity/entity.dart';
 
 part 'moor_chat_database.g.dart';
 
diff --git a/packages/stream_chat_persistence/lib/src/entity/channels.dart b/packages/stream_chat_persistence/lib/src/entity/channels.dart
index 38a40081..7e32906e 100644
--- a/packages/stream_chat_persistence/lib/src/entity/channels.dart
+++ b/packages/stream_chat_persistence/lib/src/entity/channels.dart
@@ -17,7 +17,7 @@ class Channels extends Table {
   TextColumn get config => text().map(MapConverter<Object>())();
 
   /// True if this channel entity is frozen
-  BoolColumn get frozen => boolean().withDefault(Constant(false))();
+  BoolColumn get frozen => boolean().withDefault(const Constant(false))();
 
   /// The date of the last message
   DateTimeColumn get lastMessageAt => dateTime().nullable()();
diff --git a/packages/stream_chat_persistence/pubspec.yaml b/packages/stream_chat_persistence/pubspec.yaml
index 47e2778f..12d117b1 100644
--- a/packages/stream_chat_persistence/pubspec.yaml
+++ b/packages/stream_chat_persistence/pubspec.yaml
@@ -11,17 +11,17 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  mutex: ^2.0.0
-  moor: ^3.4.0
-  path: ^1.7.0
   logging: ^0.11.4
   meta: ^1.2.4
+  moor: ^3.4.0
+  mutex: ^2.0.0
+  path: ^1.7.0
   path_provider: ^1.6.27
   sqlite3_flutter_libs: ^0.4.0+1
   stream_chat: ^1.5.0
 
 dev_dependencies:
-  test: ^1.15.7
   build_runner: ^1.11.0
   moor_generator: ^3.4.1
   pedantic: ^1.9.2
+  test: ^1.15.7