diff --git a/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java
index 463c6adc6..37b00ed53 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java
@@ -274,7 +274,7 @@ public class ClientDetailsEntity implements ClientDetails {
 
 	@Override
 	@Basic
-	public int getAccessTokenValiditySeconds() {
+	public Integer getAccessTokenValiditySeconds() {
 		return accessTokenValiditySeconds;
 	}
 	
@@ -288,7 +288,7 @@ public class ClientDetailsEntity implements ClientDetails {
 
 	@Override
 	@Basic
-	public int getRefreshTokenValiditySeconds() {
+	public Integer getRefreshTokenValiditySeconds() {
 		return refreshTokenValiditySeconds;
 	}