diff --git a/benchmarks/benchmark_experiment.py b/benchmarks/benchmark_experiment.py
index a546a78ed67..c2c2d8f88f5 100644
--- a/benchmarks/benchmark_experiment.py
+++ b/benchmarks/benchmark_experiment.py
@@ -177,8 +177,13 @@ def get_device(self):
 
   @property
   def filename_str(self):
-    return "-".join(
-        str(x) if x is not None else 'None' for x in self.to_dict().values())
+    d = self.to_dict()
+
+    # Remove these 2 components that may end up making the filename too big.
+    d.pop("accelerator_model", None)
+    d.pop("xla_flags", None)
+
+    return "-".join(str(v) for v in self.to_dict().values()).replace(" ", "")
 
   def to_dict(self):
     d = OrderedDict()