diff --git a/services/libs/tinybird/pipes/active_contributors.pipe b/services/libs/tinybird/pipes/active_contributors.pipe
index d1b06583d2..bee53a0e11 100644
--- a/services/libs/tinybird/pipes/active_contributors.pipe
+++ b/services/libs/tinybird/pipes/active_contributors.pipe
@@ -52,10 +52,10 @@ SQL >
 NODE maintainers_count
 SQL >
     %
-    SELECT uniq(memberId) AS maintainerCount
+    SELECT uniqIf(memberId, memberId != '') AS maintainerCount
     FROM maintainers_roles_copy_ds
     WHERE
-        insightsProjectId = (SELECT insightsProjectId FROM segments_filtered)
+        insightsProjectId = (SELECT insightsProjectId FROM segments_filtered) AND role = 'maintainer'
         {% if defined(repos) %}
             AND repoUrl
             IN {{ Array(repos, 'String', description="Filter maintainer repo list", required=False) }}
@@ -73,7 +73,8 @@ SQL >
             OR endDate
             >= {% if defined(startDate) %}
                 {{ DateTime(startDate, description="Filter maintainer start date", required=False) }}
-            {% else %} toDateTime64('1970-01-01 00:00:00', 3)
+            {% elif defined(endDate) %} toDateTime64('1970-01-01 00:00:00', 3)
+            {% else %} now()
             {% end %}
         )
 
diff --git a/services/libs/tinybird/pipes/maintainers_roles_copy.pipe b/services/libs/tinybird/pipes/maintainers_roles_copy.pipe
index c0e561f391..3fd87baba0 100644
--- a/services/libs/tinybird/pipes/maintainers_roles_copy.pipe
+++ b/services/libs/tinybird/pipes/maintainers_roles_copy.pipe
@@ -7,7 +7,17 @@ SQL >
 
 NODE maintainers_roles_copy_member_identities_deduplicated
 SQL >
-    SELECT id, memberId FROM memberIdentities FINAL WHERE isNull (deletedAt)
+    SELECT id, memberId
+    FROM
+        (
+            SELECT
+                id,
+                argMax((mi.memberId, mi.deletedAt), mi.updatedAt) .1 AS memberId,
+                argMax((mi.memberId, mi.deletedAt), mi.updatedAt) .2 AS deletedAt
+            FROM memberIdentities as mi
+            GROUP BY id
+        ) AS deduped
+    WHERE isNull (deduped.deletedAt)
 
 NODE maintainers_roles_copy_maintainers_deduplicated
 SQL >