diff --git a/lib/main.dart b/lib/main.dart
index 7e674f7..dd0cf2b 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -18,8 +18,9 @@ import 'package:waylume_server/config/supabase_config.dart';
 Middleware requestLogger() {
   return (Handler innerHandler) {
     return (Request request) async {
-      final clientIP = request.headers['x-forwarded-for'] ?? 
+      final clientIP = request.headers['x-forwarded-for']?.split(',').first.trim() ?? 
                       request.headers['x-real-ip'] ?? 
+                      (request.context['shelf.io.connection_info'] as HttpConnectionInfo?)?.remoteAddress.address ??
                       'unknown';
       final userAgent = request.headers['user-agent'] ?? 'unknown';
       final method = request.method;