diff --git a/selfdrive/tombstoned.py b/selfdrive/tombstoned.py
index 26c17b4a2..74e514d2a 100755
--- a/selfdrive/tombstoned.py
+++ b/selfdrive/tombstoned.py
@@ -17,10 +17,10 @@ from selfdrive.loggerd.config import ROOT
 from selfdrive.swaglog import cloudlog
 from selfdrive.version import branch, commit, dirty, origin, version
 
-MAX_SIZE = 100000 * 10  # Normal size is 40-100k, allow up to 1M
+MAX_SIZE = 100000 * 10  # mal size is 40-100k, allow up to 1M
 if TICI:
   MAX_SIZE = MAX_SIZE * 100  # Allow larger size for tici since files contain coredump
-MAX_TOMBSTONE_FN_LEN = 85
+MAX_TOMBSTONE_FN_LEN = 62  # 85 - 23 ("<dongle id>/crash/")
 
 TOMBSTONE_DIR = "/data/tombstones/"
 APPORT_DIR = "/var/crash/"