diff --git a/spatial/static/spatial/js/gridmap.js b/spatial/static/spatial/js/gridmap.js
index 2e03afe6c069d54fb0958b171e5e0c7a768f02ca..0d63b3ce06bb3b2989e8bfdd81f144fa54f66f45 100644
--- a/spatial/static/spatial/js/gridmap.js
+++ b/spatial/static/spatial/js/gridmap.js
@@ -9,7 +9,7 @@ let layers = [];
 //let mapserverURL="https://testvips.nibio.no/cgi-bin/";
 let mapserverURL="https://gridweb.vips.nibio.no/cgi-bin/";
 let modelId = undefined;
-let today = "2023-04-10";
+let today = getSystemTime().format("YYYY-MM-DD");
 let todayLayerIndex = undefined;
 let timestamps = undefined;
 let currentParameter = "WARNING_STATUS";
@@ -186,6 +186,12 @@ msLoadMap(): Unable to access file. (/disks/data01/mapserver/wms/SEPTREFFUM/SEPT
 	});
 	map.setView(view);
 
+    // If today is outside of the date range, use the most recent timestamp
+    if(todayLayerIndex == undefined)
+    {
+        todayLayerIndex = timestamps.length -1;
+    }
+
     let range = document.getElementById("layerDateRange");
     range.min = 0;
     range.max = timestamps.length -1;