diff --git a/src/main/java/org/jenkinsci/plugins/cas/spring/security/SessionUrlAuthenticationSuccessHandler.java b/src/main/java/org/jenkinsci/plugins/cas/spring/security/SessionUrlAuthenticationSuccessHandler.java
index b59b160..53db05d 100644
--- a/src/main/java/org/jenkinsci/plugins/cas/spring/security/SessionUrlAuthenticationSuccessHandler.java
+++ b/src/main/java/org/jenkinsci/plugins/cas/spring/security/SessionUrlAuthenticationSuccessHandler.java
@@ -38,7 +38,7 @@ protected String determineTargetUrl(HttpServletRequest request, HttpServletRespo
 			session.removeAttribute(targetUrlSessionAttribute);
 		}
 
-		if (isAlwaysUseDefaultTargetUrl() || StringUtils.hasText(request.getParameter(getTargetUrlParameter())) || !StringUtils.hasText(targetUrl)) {
+		if (isAlwaysUseDefaultTargetUrl() || !StringUtils.hasText(targetUrl) || (getTargetUrlParameter() != null && StringUtils.hasText(request.getParameter(getTargetUrlParameter())))) {
 			return super.determineTargetUrl(request, response);
 		}