diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index b568221212d71f..2ca2bc3895cc55 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -3018,6 +3018,7 @@ def assertEqualExcept(actual, expected, ignore):
             assertEqualExcept(extract(limit=100), nolim[-100:], -5-1)
             self.assertEqual(extract(limit=-2), nolim[:2])
             assertEqualExcept(extract(limit=-100), nolim[:100], len(nolim)-5-1)
+            assertEqualExcept(extract(limit=1000), nolim[-1000:], -5-1)
             self.assertEqual(extract(limit=0), [])
             del sys.tracebacklimit
             assertEqualExcept(extract(), nolim, -5-1)
diff --git a/Lib/traceback.py b/Lib/traceback.py
index 3e708c6f86a4c5..48fa6a2aedcdf6 100644
--- a/Lib/traceback.py
+++ b/Lib/traceback.py
@@ -455,7 +455,7 @@ def _extract_from_extended_frame_gen(klass, frame_gen, *, limit=None,
         # information is not available.
         builtin_limit = limit is BUILTIN_EXCEPTION_LIMIT
         if limit is None or builtin_limit:
-            limit = getattr(sys, 'tracebacklimit', None)
+            limit = getattr(sys, 'tracebacklimit', 1_000)
             if limit is not None and limit < 0:
                 limit = 0
         if limit is not None: