diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index e34f92e4b..4e9c69db8 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -64,6 +64,7 @@ Fixed
 
 - Fixed crash when doing `:<space><enter>`, another corner-case introduced in v0.8.0
 - Fixed `:open-editor` (`<Ctrl-e>`) on Windows
+- Fixed crash when setting `general -> auto-save-interval` to a too big value.
 
 v0.8.2
 ------
diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py
index 785518262..7f2d9049a 100644
--- a/qutebrowser/config/configdata.py
+++ b/qutebrowser/config/configdata.py
@@ -154,7 +154,7 @@ def data(readonly=False):
              "Whether to save the config automatically on quit."),
 
             ('auto-save-interval',
-             SettingValue(typ.Int(minval=0), '15000'),
+             SettingValue(typ.Int(minval=0, maxval=MAXVALS['int']), '15000'),
              "How often (in milliseconds) to auto-save config/cookies/etc."),
 
             ('editor',