diff --git a/tools/analysis_tools/analyze_logs.py b/tools/analysis_tools/analyze_logs.py
index 926412e27ba..520e48e0863 100755
--- a/tools/analysis_tools/analyze_logs.py
+++ b/tools/analysis_tools/analyze_logs.py
@@ -177,6 +177,9 @@ def load_json_logs(json_logs):
                 if not len(log) > 1:
                     continue
 
+                if 'epoch' in log.keys():
+                    epoch = log['epoch']
+
                 if epoch not in log_dict:
                     log_dict[epoch] = defaultdict(list)
 
@@ -189,9 +192,6 @@ def load_json_logs(json_logs):
                     else:
                         log_dict[epoch][k].append(v)
 
-                if 'epoch' in log.keys():
-                    epoch = log['epoch']
-
     return log_dicts