diff --git a/pkg/api/map_image_proxies.go b/pkg/api/map_image_proxies.go
index 6702f196..ecfb8acb 100644
--- a/pkg/api/map_image_proxies.go
+++ b/pkg/api/map_image_proxies.go
@@ -32,6 +32,10 @@ func (p *MapImageProxy) MapTileImageProxyHandler(c *core.Context) (*httputil.Rev
 	mapProvider := strings.Replace(c.Query("provider"), "-", "_", -1)
 	targetUrl := ""
 
+	if mapProvider != settings.Container.Current.MapProvider {
+		return nil, errs.ErrMapProviderNotCurrent
+	}
+
 	if mapProvider == settings.OpenStreetMapProvider {
 		targetUrl = openStreetMapTileImageUrlFormat
 	} else if mapProvider == settings.OpenStreetMapHumanitarianStyleProvider {
diff --git a/pkg/errs/error.go b/pkg/errs/error.go
index 292c431e..4d49fa4f 100644
--- a/pkg/errs/error.go
+++ b/pkg/errs/error.go
@@ -28,6 +28,7 @@ const (
 	NormalSubcategoryCategory       = 6
 	NormalSubcategoryTag            = 7
 	NormalSubcategoryDataManagement = 8
+	NormalSubcategoryMapProxy       = 9
 )
 
 // Error represents the specific error returned to user
diff --git a/pkg/errs/map_image_proxy.go b/pkg/errs/map_image_proxy.go
new file mode 100644
index 00000000..12948177
--- /dev/null
+++ b/pkg/errs/map_image_proxy.go
@@ -0,0 +1,8 @@
+package errs
+
+import "net/http"
+
+// Error codes related to map image proxy
+var (
+	ErrMapProviderNotCurrent = NewNormalError(NormalSubcategoryMapProxy, 0, http.StatusBadRequest, "specified map provider is not set")
+)