diff --git a/app/models/friend_domain.rb b/app/models/friend_domain.rb
index 76e18b6bf6467f..e919a9132e0b84 100644
--- a/app/models/friend_domain.rb
+++ b/app/models/friend_domain.rb
@@ -167,7 +167,7 @@ def some_local_account
   end
 
   def ensure_disabled
-    delete_for_friend! unless i_am_idle? && they_are_idle?
+    delete_for_friend! unless id.nil? || (i_am_idle? && they_are_idle?)
   end
 
   def set_default_inbox_url