diff --git a/geowebcache/rest/src/main/java/org/geowebcache/rest/converter/XStreamListAliasWrapper.java b/geowebcache/rest/src/main/java/org/geowebcache/rest/converter/XStreamListAliasWrapper.java
index 468d01845..c62025eea 100644
--- a/geowebcache/rest/src/main/java/org/geowebcache/rest/converter/XStreamListAliasWrapper.java
+++ b/geowebcache/rest/src/main/java/org/geowebcache/rest/converter/XStreamListAliasWrapper.java
@@ -93,9 +93,9 @@ public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingC
                     UriComponents uriComponents = MvcUriComponentsBuilder.fromMethodName(
                                     controllerClass, alias + "Get", name)
                             .buildAndExpand("");
-                    // build URI with URI.normalize() to remove double slashes
+                    // remove the repeated gwc that GeoServer (sometimes) adds to the URL
                     String normalizedLayerUri = URI.create(
-                                    uriComponents.encode().toUriString().replace("$", ""))
+                                    uriComponents.encode().toUriString().replace("/gwc/gwc", "/gwc"))
                             .normalize()
                             .toASCIIString();
                     writer.addAttribute("href", normalizedLayerUri + ".xml");