diff --git a/pom.xml b/pom.xml
index bc49ec0..c9c4435 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>org.gcube.portlets.admin</groupId>
 	<artifactId>rmp-common-library</artifactId>
-	<version>2.5.0-SNAPSHOT</version>
+	<version>2.6.0-SNAPSHOT</version>
 	<name>Resource Management Library</name>
 	<description>
 		gCube Resource Management Library is a common library containing shared code for Information System Operations 
diff --git a/src/main/java/org/gcube/resourcemanagement/support/shared/util/TokenFilter.java b/src/main/java/org/gcube/resourcemanagement/support/shared/util/TokenFilter.java
new file mode 100644
index 0000000..c96ffc9
--- /dev/null
+++ b/src/main/java/org/gcube/resourcemanagement/support/shared/util/TokenFilter.java
@@ -0,0 +1,35 @@
+package org.gcube.resourcemanagement.support.shared.util;
+
+
+	import java.io.IOException;
+
+	import javax.servlet.Filter;
+	import javax.servlet.FilterChain;
+	import javax.servlet.FilterConfig;
+	import javax.servlet.ServletException;
+	import javax.servlet.ServletRequest;
+	import javax.servlet.ServletResponse;
+
+	import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
+
+	public class TokenFilter  implements Filter {
+
+		@Override
+		public void init(FilterConfig filterConfig) throws ServletException {
+			
+		}
+
+		@Override
+		public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+			SecurityTokenProvider.instance.reset();
+			chain.doFilter(request, response);
+			SecurityTokenProvider.instance.reset();
+		}
+
+		@Override
+		public void destroy() {
+			
+		}
+
+	}
+