diff --git a/lib/screens/logs/logs.dart b/lib/screens/logs/logs.dart
index da56dcc..6d9cef6 100644
--- a/lib/screens/logs/logs.dart
+++ b/lib/screens/logs/logs.dart
@@ -31,8 +31,6 @@ class Logs extends StatefulWidget {
 }
 
 class _LogsState extends State<Logs> {
-  late ScrollController scrollController;
-
   bool showDivider = true;
 
   Log? selectedLog;
@@ -65,25 +63,26 @@ class _LogsState extends State<Logs> {
     }
   }
 
-  void scrollListener() {
+  bool scrollListener(ScrollUpdateNotification scrollNotification) {
     final logsProvider = Provider.of<LogsProvider>(context, listen: false);
 
-    if (scrollController.position.extentAfter < 500 && logsProvider.isLoadingMore == false) {
+    if (scrollNotification.metrics.extentAfter < 500 && logsProvider.isLoadingMore == false) {
       logsProvider.fetchLogs(loadingMore: true);
     }
-    if (scrollController.position.pixels > 0) {
+    if (scrollNotification.metrics.pixels > 0) {
       setState(() => showDivider = false);
     }
     else {
       setState(() => showDivider = true);
     }
+    
+    return false;
   }
 
   @override
   void initState() {
     final logsProvider = Provider.of<LogsProvider>(context, listen: false);
 
-    scrollController = ScrollController()..addListener(scrollListener);
     logsProvider.fetchLogs(inOffset: 0);
     fetchFilteringRules();
     fetchClients();
@@ -236,78 +235,83 @@ class _LogsState extends State<Logs> {
                   await logsProvider.fetchLogs(inOffset: 0);
                 },
                 displacement: 95,
-                child: CustomScrollView(
-                  slivers: [
-                    SliverOverlapInjector(
-                      handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
-                    ),
-                    if (logsProvider.logsData!.data.isNotEmpty) SliverList.builder(
-                      itemCount: logsProvider.logsData!.data.length,
-                      itemBuilder: (context, index) {
-                        if (logsProvider.isLoadingMore == true && index == logsProvider.logsData!.data.length) {
-                          return const Padding(
-                            padding: EdgeInsets.symmetric(vertical: 20),
-                            child: Center(
-                              child: CircularProgressIndicator(),
-                            ),
-                          );
-                        }
-                        else if (logsProvider.logsData!.data[index].question.name != null) {
-                          return LogTile(
-                            log: logsProvider.logsData!.data[index],
-                            index: index,
-                            length: logsProvider.logsData!.data.length,
-                            isLogSelected: selectedLog != null && selectedLog == logsProvider.logsData!.data[index],
-                            onLogTap: (log) {
-                              if (width <= 1100) {
-                                Navigator.push(context, MaterialPageRoute(
-                                  builder: (context) => LogDetailsScreen(
-                                    log: log,
-                                    dialog: false,
-                                  )
-                                ));
+                child: NotificationListener(
+                  onNotification: scrollListener,
+                  child: CustomScrollView(
+                    slivers: [
+                      SliverOverlapInjector(
+                        handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
+                      ),
+                      if (logsProvider.logsData!.data.isNotEmpty) SliverList.builder(
+                        itemCount: logsProvider.isLoadingMore 
+                          ? logsProvider.logsData!.data.length + 1 
+                          : logsProvider.logsData!.data.length,
+                        itemBuilder: (context, index) {
+                          if (logsProvider.isLoadingMore == true && index == logsProvider.logsData!.data.length) {
+                            return const Padding(
+                              padding: EdgeInsets.symmetric(vertical: 20),
+                              child: Center(
+                                child: CircularProgressIndicator(),
+                              ),
+                            );
+                          }
+                          else if (logsProvider.logsData!.data[index].question.name != null) {
+                            return LogTile(
+                              log: logsProvider.logsData!.data[index],
+                              index: index,
+                              length: logsProvider.logsData!.data.length,
+                              isLogSelected: selectedLog != null && selectedLog == logsProvider.logsData!.data[index],
+                              onLogTap: (log) {
+                                if (width <= 1100) {
+                                  Navigator.push(context, MaterialPageRoute(
+                                    builder: (context) => LogDetailsScreen(
+                                      log: log,
+                                      dialog: false,
+                                    )
+                                  ));
+                                }
+                                setState(() => selectedLog = log);
                               }
-                              setState(() => selectedLog = log);
-                            }
-                          );
+                            );
+                          }
+                          else {
+                            return null;
+                          }
                         }
-                        else {
-                          return null;
-                        }
-                      }
-                    ),
-                    if (logsProvider.logsData!.data.isEmpty) SliverFillRemaining(
-                      child: Center(
-                        child: Column(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [
-                            Text(
-                              AppLocalizations.of(context)!.noLogsDisplay,
-                              style: TextStyle(
-                                fontSize: 24,
-                                color: Theme.of(context).colorScheme.onSurfaceVariant,
-                              ),
-                            ),
-                            if (logsProvider.logsOlderThan != null) Padding(
-                              padding: const EdgeInsets.only(
-                                top: 30,
-                                left: 20,
-                                right: 20
-                              ),
-                              child: Text(
-                                AppLocalizations.of(context)!.noLogsThatOld,
-                                textAlign: TextAlign.center,
+                      ),
+                      if (logsProvider.logsData!.data.isEmpty) SliverFillRemaining(
+                        child: Center(
+                          child: Column(
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              Text(
+                                AppLocalizations.of(context)!.noLogsDisplay,
                                 style: TextStyle(
-                                  fontSize: 16,
+                                  fontSize: 24,
                                   color: Theme.of(context).colorScheme.onSurfaceVariant,
                                 ),
                               ),
-                            ),
-                          ]
+                              if (logsProvider.logsOlderThan != null) Padding(
+                                padding: const EdgeInsets.only(
+                                  top: 30,
+                                  left: 20,
+                                  right: 20
+                                ),
+                                child: Text(
+                                  AppLocalizations.of(context)!.noLogsThatOld,
+                                  textAlign: TextAlign.center,
+                                  style: TextStyle(
+                                    fontSize: 16,
+                                    color: Theme.of(context).colorScheme.onSurfaceVariant,
+                                  ),
+                                ),
+                              ),
+                            ]
+                          ),
                         ),
-                      ),
-                    )
-                  ],
+                      )
+                    ],
+                  ),
                 ),
               ),
             )