diff --git a/vis.py b/vis.py
index 74e20b4f81ff49fb634b34b25f6b18c384f71dfd..cc1a1d8ed572712074e55cedec171bf4fc1ea6f8 100644
--- a/vis.py
+++ b/vis.py
@@ -202,9 +202,9 @@ def draw_figures(out_folder, job_name, fig_range_dict, counts_by_element, symbol
     # ------------------------------
     # TODO: limit drawing to ranges
     profile_mean_range = fig_range_dict['profile_mean_range']
-    if profile_mean_range[1] == math.inf:
-        profile_mean_range[1] = collect_range[1]
     if profile_mean_range:
+        if profile_mean_range[1] == math.inf:
+            profile_mean_range[1] = collect_range[1]
         # make a new figure in slot 1
         figure_mean = plt.figure(1, figsize=(7, 7))
         # draw on the current figure
@@ -229,9 +229,9 @@ def draw_figures(out_folder, job_name, fig_range_dict, counts_by_element, symbol
 
     # TODO: anim for dynamic number of symbols
     profile_anim_range = fig_range_dict['profile_anim_range']
-    if profile_anim_range[1] == math.inf:
-        profile_anim_range[1] = collect_range[1]
     if profile_anim_range:
+        if profile_anim_range[1] == math.inf:
+            profile_anim_range[1] = collect_range[1]
         # make a new figure in slot 2
         figure_anim = plt.figure(2, figsize=(7, 7))
         lines = []
@@ -274,9 +274,9 @@ def draw_figures(out_folder, job_name, fig_range_dict, counts_by_element, symbol
                                       repeat=False, interval=100)
 
     energy_range = fig_range_dict['energy_range']
-    if energy_range[1] == math.inf:
-        energy_range[1] = collect_range[1]
     if energy_range:
+        if energy_range[1] == math.inf:
+            energy_range[1] = collect_range[1]
         # make a new figure in slot 3
         figure_energy = plt.figure(3, figsize=(7, 7))
         # draw on the current figure