diff --git a/confidant/settings.py b/confidant/settings.py
index 60faccd1..d8c800fa 100644
--- a/confidant/settings.py
+++ b/confidant/settings.py
@@ -344,6 +344,8 @@ def str_env(var_name, default=''):
 PYNAMO_REQUEST_TIMEOUT_SECONDS = int_env('PYNAMO_REQUEST_TIMEOUT_SECONDS', 1)
 # page limit size for history API endpoints listing
 HISTORY_PAGE_LIMIT = int_env('HISTORY_PAGE_LIMIT')
+if HISTORY_PAGE_LIMIT == 0:
+    HISTORY_PAGE_LIMIT = None
 
 # Encryption