diff --git a/lib/rolify/adapters/active_record/role_adapter.rb b/lib/rolify/adapters/active_record/role_adapter.rb
index 54c385d3..7d573c4f 100644
--- a/lib/rolify/adapters/active_record/role_adapter.rb
+++ b/lib/rolify/adapters/active_record/role_adapter.rb
@@ -50,7 +50,8 @@ def add(relation, role)
       end
 
       def remove(relation, role_name, resource = nil)
-        cond = { :name => role_name }
+        cond = {}
+        cond[:name] = role_name unless role_name.blank?
         cond[:resource_type] = (resource.is_a?(Class) ? resource.to_s : resource.class.name) if resource
         cond[:resource_id] = resource.id if resource && !resource.is_a?(Class)
         roles = relation.roles.where(cond)
diff --git a/lib/rolify/adapters/mongoid/role_adapter.rb b/lib/rolify/adapters/mongoid/role_adapter.rb
index 042a8b73..a888c34e 100644
--- a/lib/rolify/adapters/mongoid/role_adapter.rb
+++ b/lib/rolify/adapters/mongoid/role_adapter.rb
@@ -66,7 +66,8 @@ def remove(relation, role_name, resource = nil)
         #
         #  role.destroy if role.send(user_class.to_s.tableize.to_sym).empty?
         #end
-        cond = { :name => role_name }
+        cond = {}
+        cond[:name] = role_name unless role_name.blank?
         cond[:resource_type] = (resource.is_a?(Class) ? resource.to_s : resource.class.name) if resource
         cond[:resource_id] = resource.id if resource && !resource.is_a?(Class)
         roles = relation.roles.where(cond)