diff --git a/source/java/org/alfresco/repo/activities/ActivityServiceImpl.java b/source/java/org/alfresco/repo/activities/ActivityServiceImpl.java
index 85f0582973..a4e794035a 100644
--- a/source/java/org/alfresco/repo/activities/ActivityServiceImpl.java
+++ b/source/java/org/alfresco/repo/activities/ActivityServiceImpl.java
@@ -235,6 +235,16 @@ public class ActivityServiceImpl implements ActivityService, InitializingBean
         
         List<ActivityFeedEntity> result = new ArrayList<ActivityFeedEntity>();
         
+        // avoid DB calls if filters are empty
+        if(actvityFilter != null && actvityFilter.isEmpty())
+        {
+            return result;
+        }
+        if(userFilter != null && userFilter.isEmpty())
+        {
+            return result;
+        }
+        
         try
         {
             if (siteId != null)