diff --git a/java/com.sap.sailing.dashboards.gwt/WEB-INF/web.xml b/java/com.sap.sailing.dashboards.gwt/WEB-INF/web.xml
index 33797f9786f..32fcb29c829 100644
--- a/java/com.sap.sailing.dashboards.gwt/WEB-INF/web.xml
+++ b/java/com.sap.sailing.dashboards.gwt/WEB-INF/web.xml
@@ -37,7 +37,16 @@
 		<url-pattern>*.html</url-pattern>
 	</filter-mapping>
 
-	<servlet>
+        <filter>
+                <filter-name>GWTCacheControlServletFilter</filter-name>
+                <filter-class>com.sap.sse.gwt.server.GWTCacheControlServletFilter</filter-class>
+        </filter>
+        <filter-mapping>
+                <filter-name>GWTCacheControlServletFilter</filter-name>
+                <url-pattern>/*</url-pattern>
+        </filter-mapping>
+        
+  	<servlet>
 		<display-name>Dashboard Dispatch Service</display-name>
 		<servlet-name>dashboardDispatch</servlet-name>
 		<servlet-class>com.sap.sailing.dashboards.gwt.server.DashboardDispatchServlet</servlet-class>
diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/server/GWTCacheControlServletFilter.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/server/GWTCacheControlServletFilter.java
index b18a4cb5aed..c33b787ec7d 100644
--- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/server/GWTCacheControlServletFilter.java
+++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/server/GWTCacheControlServletFilter.java
@@ -25,11 +25,9 @@ public class GWTCacheControlServletFilter implements Filter {
 
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain)
             throws IOException, ServletException {
-
         HttpServletRequest httpRequest = (HttpServletRequest) request;
         String requestURI = httpRequest.getRequestURI();
         HttpServletResponse httpResponse = (HttpServletResponse) response;
-
         if (requestURI.contains(".nocache.")) {
             Date now = new Date();
             httpResponse.setDateHeader("Date", now.getTime());
@@ -40,7 +38,6 @@ public class GWTCacheControlServletFilter implements Filter {
         } else if (requestURI.contains(".cache.")) {
             httpResponse.setHeader("Cache-Control", "max-age=2592000");
         }
-
         filterChain.doFilter(request, response);
     }
 }