diff --git a/api/src/main/java/org/openmrs/ui/framework/session/Session.java b/api/src/main/java/org/openmrs/ui/framework/session/Session.java
index e92d851..693be02 100644
--- a/api/src/main/java/org/openmrs/ui/framework/session/Session.java
+++ b/api/src/main/java/org/openmrs/ui/framework/session/Session.java
@@ -55,4 +55,7 @@ public <T> T getAttribute(String name, Class<T> asType) {
 		return (T) httpSession.getAttribute(name);
 	}
 	
+	public void setHttpSession(HttpSession httpSession) {
+		this.httpSession = httpSession;
+	}
 }
diff --git a/api/src/main/java/org/openmrs/ui/framework/session/SessionFactory.java b/api/src/main/java/org/openmrs/ui/framework/session/SessionFactory.java
index f961bbb..a446f7a 100644
--- a/api/src/main/java/org/openmrs/ui/framework/session/SessionFactory.java
+++ b/api/src/main/java/org/openmrs/ui/framework/session/SessionFactory.java
@@ -47,6 +47,7 @@ public Session ensureSession(HttpSession httpSession) {
 					}
 				}
 			}
+			session.setHttpSession(httpSession);
 			return session;
 		}
 	}
@@ -70,10 +71,12 @@ public Session getSession(HttpSession httpSession) {
 			ret = null;
 		}
 		
-		if (ret != null)
+		if (ret != null) {
+			ret.setHttpSession(httpSession);
 			return ret;
-		else
+		} else {
 			return ensureSession(httpSession);
+		}
 	}
 	
 	/**