diff --git a/sites/all/modules/flag/flag.module b/sites/all/modules/flag/flag.module
index 323d728..6b8a193 100644
--- a/sites/all/modules/flag/flag.module
+++ b/sites/all/modules/flag/flag.module
@@ -853,7 +853,8 @@ function flag_flag_access_multiple($flag, $content_ids, $account) {
  *   The number of flaggings allowed. Any flaggings beyond that will be trimmed.
  */
 function flag_trim_flag($flag, $account, $cutoff_size) {
-  $result = db_query("SELECT * FROM {flag_content} WHERE fid = %d AND (uid = %d OR uid = 0) ORDER BY timestamp DESC", $flag->fid, $account->uid);
+  $sid = flag_get_sid($account->uid);
+  $result = db_query("SELECT * FROM {flag_content} WHERE fid = %d AND (uid = %d AND sid = %d) ORDER BY timestamp DESC", $flag->fid, $account->uid, $sid);
   $i = 1;
   while ($row = db_fetch_object($result)) {
     if ($i++ > $cutoff_size) {