diff --git a/ui/src/app/widget/lib/map-widget2.js b/ui/src/app/widget/lib/map-widget2.js
index 2b2f72bc13..fac3de7aa2 100644
--- a/ui/src/app/widget/lib/map-widget2.js
+++ b/ui/src/app/widget/lib/map-widget2.js
@@ -78,10 +78,10 @@ export default class TbMapWidgetV2 {
 			tbMap.tooltipActionsMap[descriptor.name] = descriptor;
 		});
 
+		let openStreetMapProvider = {};
 		if (mapProvider === 'google-map') {
 			this.map = new TbGoogleMap($element, this.utils, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, settings.disableScrollZooming, minZoomLevel, settings.gmApiKey, settings.gmDefaultMapType);
 		} else if (mapProvider === 'openstreet-map') {
-			let openStreetMapProvider = {};
 			if (settings.useCustomProvider && settings.customProviderTileUrl) {
                 openStreetMapProvider.name = settings.customProviderTileUrl;
                 openStreetMapProvider.isCustom = true;
@@ -90,7 +90,8 @@ export default class TbMapWidgetV2 {
 			}
 			this.map = new TbOpenStreetMap($element, this.utils, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, settings.disableScrollZooming, minZoomLevel, openStreetMapProvider);
 		} else if (mapProvider === 'here') {
-			this.map = new TbOpenStreetMap($element, this.utils, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, settings.disableScrollZooming, minZoomLevel, settings.mapProvider, settings.credentials);
+			openStreetMapProvider.name = settings.mapProvider;
+			this.map = new TbOpenStreetMap($element, this.utils, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, settings.disableScrollZooming, minZoomLevel, openStreetMapProvider, settings.credentials);
 		} else if (mapProvider === 'image-map') {
 			this.map = new TbImageMap(this.ctx, $element, this.utils, initCallback,
 				settings.mapImageUrl,
diff --git a/ui/src/app/widget/lib/openstreet-map.js b/ui/src/app/widget/lib/openstreet-map.js
index cf1dc46d6b..c7d253ea3f 100644
--- a/ui/src/app/widget/lib/openstreet-map.js
+++ b/ui/src/app/widget/lib/openstreet-map.js
@@ -33,17 +33,17 @@ export default class TbOpenStreetMap {
 			};
 		}
 
-		if (mapProvider.startsWith("HERE.")) {
+		if (mapProvider.name.startsWith("HERE.")) {
 			credentials.app_id = credentials.app_id || "AhM6TzD9ThyK78CT3ptx";
 			credentials.app_code = credentials.app_code || "p6NPiITB3Vv0GMUFnkLOOg";
 		}
 
+		this.map = L.map($containerElement[0]).setView([0, 0], this.defaultZoomLevel || 8);
+
 		if (disableScrollZooming) {
 			this.map.scrollWheelZoom.disable();
 		}
 
-		this.map = L.map($containerElement[0]).setView([0, 0], this.defaultZoomLevel || 8);
-
 		var tileLayer = mapProvider.isCustom ? L.tileLayer(mapProvider.name) : L.tileLayer.provider(mapProvider.name, credentials);
 		tileLayer.addTo(this.map);