diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14b252e5..e0ecfc82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+ * fixed deprecation warning with Rails 4 (Relation#update_all with conditions is deprecated)
  * fixing issue #69 (ActiveRecord scopes are not chainable)
 
 ## 3.0.18
diff --git a/lib/aasm/persistence/active_record_persistence.rb b/lib/aasm/persistence/active_record_persistence.rb
index 3eae3b31..d14f6390 100644
--- a/lib/aasm/persistence/active_record_persistence.rb
+++ b/lib/aasm/persistence/active_record_persistence.rb
@@ -82,7 +82,7 @@ def aasm_write_state(state)
           write_attribute(self.class.aasm_column, state.to_s)
 
           success = if AASM::StateMachine[self.class].config.skip_validation_on_save
-            self.class.update_all({ self.class.aasm_column => state.to_s }, self.class.primary_key => self.id) == 1
+            self.class.where(self.class.primary_key => self.id).update_all(self.class.aasm_column => state.to_s) == 1
           else
             self.save
           end