diff --git a/SampleApps/Shared/MapLayers.cs b/SampleApps/Shared/MapLayers.cs
index 870e4a63..510616ce 100644
--- a/SampleApps/Shared/MapLayers.cs
+++ b/SampleApps/Shared/MapLayers.cs
@@ -79,6 +79,7 @@ namespace ViewModel
                     SourceName = "Bing Maps Aerial",
                     Description = "© [Microsoft](http://www.bing.com/maps/)",
                     Mode = BingMapsTileLayer.MapMode.Aerial,
+                    MaxZoomLevel = 21,
                     MapForeground = new SolidColorBrush(Colors.White),
                     MapBackground = new SolidColorBrush(Colors.Black)
                 }
@@ -114,13 +115,7 @@ namespace ViewModel
             },
             {
                 "SevenCs ChartServer",
-                new WmsImageLayer
-                {
-                    Description = "© [SevenCs GmbH](http://www.sevencs.com)",
-                    ServiceUri = new Uri("http://chartserver4.sevencs.com:8080"),
-                    Layers = "ENC",
-                    MaxBoundingBoxWidth = 360
-                }
+                new ChartServerLayer()
             }
         };
 
@@ -175,4 +170,22 @@ namespace ViewModel
             }
         }
     }
+
+    public class ChartServerLayer : WmsImageLayer
+    {
+        public ChartServerLayer()
+        {
+            Description = "© [SevenCs GmbH](http://www.sevencs.com)";
+            ServiceUri = new Uri("https://wms.sevencs.com:9090");
+            Layers = "ENC";
+            MaxBoundingBoxWidth = 360;
+        }
+
+        protected override string GetCrsParam(MapProjection projection)
+        {
+            return base.GetCrsParam(projection)
+                .Replace("AUTO2:97001", "AUTO2:7CS01")
+                .Replace("AUTO2:97002", "AUTO2:7CS02");
+        }
+    }
 }