2 files changed, 5 insertions, 1 deletions
diff --git a/lib/irb/history.rb b/lib/irb/history.rb
index 25fa71b9c3..0beff15539 100644
--- a/lib/irb/history.rb
+++ b/lib/irb/history.rb
@@ -2,9 +2,13 @@ require "pathname"
 
 module IRB
   module History
+    DEFAULT_ENTRY_LIMIT = 1000
+
     class << self
       # Integer representation of <code>IRB.conf[:HISTORY_FILE]</code>.
       def save_history
+        return 0 if IRB.conf[:SAVE_HISTORY] == false
+        return DEFAULT_ENTRY_LIMIT if IRB.conf[:SAVE_HISTORY] == true
         IRB.conf[:SAVE_HISTORY].to_i
       end
 
diff --git a/lib/irb/init.rb b/lib/irb/init.rb
index d474bd41d6..b41536e61a 100644
--- a/lib/irb/init.rb
+++ b/lib/irb/init.rb
@@ -93,7 +93,7 @@ module IRB # :nodoc:
     @CONF[:VERBOSE] = nil
 
     @CONF[:EVAL_HISTORY] = nil
-    @CONF[:SAVE_HISTORY] = 1000
+    @CONF[:SAVE_HISTORY] = History::DEFAULT_ENTRY_LIMIT
 
     @CONF[:BACK_TRACE_LIMIT] = 16