diff --git a/openbis_standard_technologies/resource/server/web.xml b/openbis_standard_technologies/resource/server/web.xml
index 44b75d5c877e85d70fd8b7e5edeab3d757130425..f1ca8566a864fc4afd517a7747f9871d0c76d662 100644
--- a/openbis_standard_technologies/resource/server/web.xml
+++ b/openbis_standard_technologies/resource/server/web.xml
@@ -47,6 +47,19 @@
         </listener-class>
     </listener>
     
+    <filter>
+        <filter-name>HeaderFilter</filter-name>
+        <filter-class>ch.systemsx.cisd.common.servlet.HeaderFilter</filter-class>
+        <init-param>
+            <param-name>X-Frame-Options</param-name>
+            <param-value>SAMEORIGIN</param-value>
+        </init-param>
+    </filter>
+    <filter-mapping>
+        <filter-name>HeaderFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    
     <filter>
         <filter-name>CacheFilter</filter-name>
         <filter-class>ch.systemsx.cisd.openbis.generic.server.CacheFilter</filter-class>