Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java	(revision 33340)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java	(revision 33422)
@@ -56,6 +56,7 @@
     public TemplatedTMSTileSource(TileSourceInfo info) {
         super(info);
-        if (info.getCookies() != null) {
-            headers.put(COOKIE_HEADER, info.getCookies());
+        String cookies = info.getCookies();
+        if (cookies != null && !cookies.isEmpty()) {
+            headers.put(COOKIE_HEADER, cookies);
         }
         handleTemplate();