diff --git a/lib/audited/audit.rb b/lib/audited/audit.rb
index a1512ea3f..526019888 100644
--- a/lib/audited/audit.rb
+++ b/lib/audited/audit.rb
@@ -171,7 +171,10 @@ def set_version_number
       if action == 'create'
         self.version = 1
       else
-        max = self.class.auditable_finder(auditable_id, auditable_type).maximum(:version) || 0
+        max = 0
+        if ::Audited.max_audits.present? && ::Audited.max_audits > 0  
+          max = self.class.auditable_finder(auditable_id, auditable_type).maximum(:version) || 0
+        end
         self.version = max + 1
       end
     end