diff --git a/src/toolbox_scs/routines/XAS.py b/src/toolbox_scs/routines/XAS.py
index 87b4c64f795850236a52c86316cbb27f8f042942..878cc284d2e04fa151386461b89ffdaab0e80643 100644
--- a/src/toolbox_scs/routines/XAS.py
+++ b/src/toolbox_scs/routines/XAS.py
@@ -192,13 +192,13 @@ def xas(nrun, bins=None, Iokey='SCS_SA3', Itkey='MCP3peaks', nrjkey='nrj',
 
     if bins is None:
         num_bins = 80
-        energy_limits = [np.min(nrj), np.max(nrj)]
+        energy_limits = [np.nanmin(nrj), np.nanmax(nrj)]
         bins = np.linspace(energy_limits[0], energy_limits[1], num_bins+1)
     elif type(bins) == int:
-        energy_limits = [np.min(nrj), np.max(nrj)]
+        energy_limits = [np.nanmin(nrj), np.nanmax(nrj)]
         bins = np.linspace(energy_limits[0], energy_limits[1], bins+1)
     elif type(bins) == float:
-        energy_limits = [np.min(nrj), np.max(nrj)]
+        energy_limits = [np.nanmin(nrj), np.nanmax(nrj)]
         bins = np.arange(energy_limits[0], energy_limits[1], bins)
 
     dummy, nosample = binning(rundata['nrj'], rundata, whichIo, bins)