diff --git web/sites/all/modules/contrib/flag_friend/flag_friend.install web/sites/all/modules/contrib/flag_friend/flag_friend.install
index de29bd3..41f9ceb 100644
--- web/sites/all/modules/contrib/flag_friend/flag_friend.install
+++ web/sites/all/modules/contrib/flag_friend/flag_friend.install
@@ -84,3 +84,11 @@ function flag_friend_update_6001() {
   db_add_index('flag_friend', 'friend_uid', array('friend_uid'));
   return st('Index added.');
 }
+
+/**
+ * Delete flag_friend data for canceled accounts.
+ */
+function flag_friend_update_7000() {
+  db_query("DELETE ff FROM {flag_friend} ff LEFT JOIN {users} u1 ON u1.uid = ff.uid LEFT JOIN {users} u2 ON u2.uid = ff.friend_uid WHERE u1.uid IS NULL OR u2.uid IS NULL");
+}
+
diff --git web/sites/all/modules/contrib/flag_friend/flag_friend.module web/sites/all/modules/contrib/flag_friend/flag_friend.module
index 7b46b56..06407c0 100644
--- web/sites/all/modules/contrib/flag_friend/flag_friend.module
+++ web/sites/all/modules/contrib/flag_friend/flag_friend.module
@@ -232,8 +232,11 @@ function flag_friend_user_account($edit, $account) {
 function flag_friend_user_cancel($edit, $account, $method) {
   // remove any friend relationships if an account is removed
   db_delete('flag_friend')
-  ->condition('uid', $account->uid)
-  ->condition('friend_uid', $account->uid)
+  ->condition(
+    db_or()
+    ->condition('uid', $account->uid)
+    ->condition('friend_uid', $account->uid)
+  )
   ->execute();
 }