diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java
index a6b8990..b19b322 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java
@@ -152,7 +152,7 @@ public class ReportServiceImpl  extends RemoteServiceServlet implements ReportSe
 	/**
 	 * 
 	 */
-	public static final String RSG_WS_ADDRESS = "RSG_WS_ADDRESS";
+	public static final String RSG_WS_ADDRESS = "RSG-WS-ENDPOINT";
 
 	private static final String REPORT_IMAGES_FOLDER = "Report Images";
 
@@ -706,13 +706,13 @@ public class ReportServiceImpl  extends RemoteServiceServlet implements ReportSe
 	}
 
 	private RSGAccessPoint getRSGWSAddress() {
-		RSGAccessPoint rsgAp = (RSGAccessPoint) getASLSession().getAttribute(RSG_WS_ADDRESS);
+		RSGAccessPoint rsgAp = (RSGAccessPoint) this.getThreadLocalRequest().getSession().getAttribute(RSG_WS_ADDRESS);
 		_log.trace("getRSGWSAddress: " + rsgAp.getRestUrl());
 		return rsgAp;
 	}
 
 	private void setRSGWSAddress(RSGAccessPoint rsgAp) {
-		getASLSession().setAttribute(RSG_WS_ADDRESS, rsgAp);
+		this.getThreadLocalRequest().getSession().setAttribute(RSG_WS_ADDRESS, rsgAp);
 		_log.trace("setting RSG WS address to " + rsgAp.getRestUrl());
 	}
 	/**