diff --git a/analysis_options.yaml b/analysis_options.yaml
index 50581314..62dcc675 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -218,10 +218,10 @@ linter:
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
 analyzer:
-  # language:
-  #   strict-casts: true
-  #   strict-inference: true
-  #   strict-raw-types: true
+  language:
+    # strict-casts: true
+    # strict-inference: true
+    strict-raw-types: true
 
   errors:
     invalid_annotation_target: ignore
diff --git a/lib/functions/refresh_server_status.dart b/lib/functions/refresh_server_status.dart
index 4f807a0c..01c41d52 100644
--- a/lib/functions/refresh_server_status.dart
+++ b/lib/functions/refresh_server_status.dart
@@ -10,7 +10,7 @@ import 'package:pi_hole_client/providers/servers_provider.dart';
 import 'package:pi_hole_client/providers/status_provider.dart';
 import 'package:provider/provider.dart';
 
-Future refreshServerStatus(BuildContext context) async {
+Future<dynamic> refreshServerStatus(BuildContext context) async {
   final statusProvider = Provider.of<StatusProvider>(context, listen: false);
   final serversProvider = Provider.of<ServersProvider>(context, listen: false);
   final appConfigProvider =
diff --git a/lib/models/log.dart b/lib/models/log.dart
index 0e90556c..76757486 100644
--- a/lib/models/log.dart
+++ b/lib/models/log.dart
@@ -13,7 +13,7 @@ class Log {
     this.answeredBy,
   });
 
-  factory Log.fromJson(List data) => Log(
+  factory Log.fromJson(List<dynamic> data) => Log(
         dateTime:
             DateTime.fromMillisecondsSinceEpoch((int.parse(data[0])) * 1000),
         type: data[1],
diff --git a/lib/providers/domains_list_provider.dart b/lib/providers/domains_list_provider.dart
index 57f862ba..c1358d52 100644
--- a/lib/providers/domains_list_provider.dart
+++ b/lib/providers/domains_list_provider.dart
@@ -98,7 +98,7 @@ class DomainsListProvider with ChangeNotifier {
     notifyListeners();
   }
 
-  Future fetchDomainsList(Server server) async {
+  Future<dynamic> fetchDomainsList(Server server) async {
     final apiGateway = serversProvider?.selectedApiGateway;
     final result = await apiGateway?.getDomainLists();
     if (result?.result == APiResponseType.success) {
diff --git a/lib/providers/servers_provider.dart b/lib/providers/servers_provider.dart
index 5f23dc5a..ba296516 100644
--- a/lib/providers/servers_provider.dart
+++ b/lib/providers/servers_provider.dart
@@ -186,7 +186,7 @@ class ServersProvider with ChangeNotifier {
     }
   }
 
-  Future saveFromDb(List<ServerDbData>? servers) async {
+  Future<dynamic> saveFromDb(List<ServerDbData>? servers) async {
     if (servers != null) {
       Server? defaultServer;
       for (final server in servers) {
diff --git a/lib/repository/database.dart b/lib/repository/database.dart
index e4ed8633..6c6e6fef 100644
--- a/lib/repository/database.dart
+++ b/lib/repository/database.dart
@@ -513,7 +513,7 @@ class DatabaseRepository {
   }
 
   // Migration methods
-  Future _upgradeToV2(Database db) async {
+  Future<dynamic> _upgradeToV2(Database db) async {
     // await db.execute('ALTER TABLE appConfig DROP COLUMN oneColumnLegend');
 
     // 1. Create a new table
diff --git a/lib/screens/home/home_appbar.dart b/lib/screens/home/home_appbar.dart
index 48f5aed3..dad3ce09 100644
--- a/lib/screens/home/home_appbar.dart
+++ b/lib/screens/home/home_appbar.dart
@@ -67,7 +67,7 @@ class HomeAppBar extends StatelessWidget implements PreferredSizeWidget {
     }
 
     Future<void> connectToServer(Server server) async {
-      Future connectSuccess(result) async {
+      Future<dynamic> connectSuccess(result) async {
         serversProvider.setselectedServer(
           server: Server(
             address: server.address,
diff --git a/lib/screens/logs/logs.dart b/lib/screens/logs/logs.dart
index 331f4f0e..819d8814 100644
--- a/lib/screens/logs/logs.dart
+++ b/lib/screens/logs/logs.dart
@@ -44,7 +44,7 @@ class _LogsState extends State<Logs> {
   DateTime? masterStartTime;
   DateTime? masterEndTime;
 
-  Future loadLogs({
+  Future<dynamic> loadLogs({
     required bool replaceOldLogs,
     List<int>? statusSelected,
     DateTime? inStartTime,
diff --git a/lib/screens/servers/servers_tile_item.dart b/lib/screens/servers/servers_tile_item.dart
index 2a99047c..3068a954 100644
--- a/lib/screens/servers/servers_tile_item.dart
+++ b/lib/screens/servers/servers_tile_item.dart
@@ -96,7 +96,7 @@ class _ServersTileItemState extends State<ServersTileItem>
 
     /// Connect to the server button
     Future<void> connectToServer(Server server) async {
-      Future connectSuccess(result) async {
+      Future<dynamic> connectSuccess(result) async {
         serversProvider.setselectedServer(
           server: Server(
             address: server.address,
diff --git a/lib/widgets/scan_token_modal.dart b/lib/widgets/scan_token_modal.dart
index 5e9cd480..da559e9d 100644
--- a/lib/widgets/scan_token_modal.dart
+++ b/lib/widgets/scan_token_modal.dart
@@ -18,7 +18,7 @@ class _ScanTokenModalState extends State<ScanTokenModal> {
   final GlobalKey qrKey = GlobalKey(debugLabel: 'QR');
   int permission = 0;
 
-  Future managePermission() async {
+  Future<dynamic> managePermission() async {
     if (await Permission.camera.isGranted) {
       setState(() {
         permission = 1;