diff --git a/datahandler.js b/datahandler.js
index 0ee9019..aceab51 100644
--- a/datahandler.js
+++ b/datahandler.js
@@ -342,7 +342,7 @@ function handleData(ws, receivedData) {
 
   // Get the received TX info
   const currentTx = fetchTx(dataToSend.freq, dataToSend.pi, dataToSend.ps);
-  if(currentTx?.station !== undefined) {
+  if(currentTx && currentTx.station !== undefined) {
     dataToSend.txInfo = {
       station: currentTx.station,
       pol: currentTx.pol,
diff --git a/web/js/setup.js b/web/js/setup.js
index 83a9651..7b71e25 100644
--- a/web/js/setup.js
+++ b/web/js/setup.js
@@ -1,7 +1,7 @@
 var map;
 var pin;
-var tilesURL='https://tiles.stadiamaps.com/tiles/alidade_smooth_dark/{z}/{x}/{y}.png';
-var mapAttrib='&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>, Tiles by <a href="http://stadiamaps.com/" target="_blank">Stadiamaps</a>';
+var tilesURL=' https://tile.openstreetmap.org/{z}/{x}/{y}.png';
+var mapAttrib='&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>';
 
 // add map container