diff --git a/agama/misc/json_finished.ftlh b/agama/misc/json_finished.ftlh
index 5d90514aa49..5f333b4bfe6 100644
--- a/agama/misc/json_finished.ftlh
+++ b/agama/misc/json_finished.ftlh
@@ -3,7 +3,8 @@
 {
 "success": ${success?c},
 <#if success>
-    "post_finish_url": "${webCtx.contextPath}/${data.post_finish_url}"
+    "post_finish_url": 
+        <#if (data.post_finish_url)??>"${webCtx.contextPath}/${data.post_finish_url}"<#else>null</#if>
 <#else>
     "error": "${jt.escStr(error!"")}"
 </#if>
diff --git a/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/servlet/ExecutionServlet.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/servlet/ExecutionServlet.java
index 80ab3019889..45a2223b98b 100644
--- a/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/servlet/ExecutionServlet.java
+++ b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/servlet/ExecutionServlet.java
@@ -58,7 +58,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response)
                 if (result == null) {
                     sendRedirect(response, request.getContextPath(), fstatus, true);
                 } else {
-                    sendFinishPage(response, result, fstatus.isNativeClient() ? null : fstatus.getStartUrl());
+                    sendFinishPage(response, result, fstatus.getStartUrl());
                 }
             } catch (FlowCrashException e) {
                 logger.error(e.getMessage(), e);
@@ -159,7 +159,7 @@ private void continueFlow(HttpServletResponse response, FlowStatus fstatus, bool
                 sendRedirect(response, request.getContextPath(), fstatus,
                         request.getMethod().equals(HttpMethod.GET));
             } else {                    
-                sendFinishPage(response, result, fstatus.isNativeClient() ? null : fstatus.getStartUrl());
+                sendFinishPage(response, result, fstatus.getStartUrl());
             }
             
         } catch (FlowTimeoutException te) {