diff --git a/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java
index 00c966cd9b..7f3f8ddac8 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java
@@ -114,6 +114,8 @@ public class OAuth2AccessTokenEntity implements OAuth2AccessToken {
 	private Set<String> scope;
 
 	private Set<Permission> permissions;
+	
+	private Map<String, Object> additionalInformation = new HashMap<>();
 
 	/**
 	 * Create a new, blank access token
@@ -145,11 +147,13 @@ public void setId(Long id) {
 	@Override
 	@Transient
 	public Map<String, Object> getAdditionalInformation() {
-		Map<String, Object> map = new HashMap<>(); //super.getAdditionalInformation();
 		if (getIdToken() != null) {
-			map.put(ID_TOKEN_FIELD_NAME, getIdTokenString());
+			additionalInformation.put(ID_TOKEN_FIELD_NAME, getIdTokenString());
 		}
-		return map;
+		else if (additionalInformation.containsKey(ID_TOKEN_FIELD_NAME)) {
+			additionalInformation.remove(ID_TOKEN_FIELD_NAME);
+		}
+		return additionalInformation;
 	}
 
 	/**