diff --git a/apps/workflow-server/gcc-workflow-server/src/main/resources/com/coremedia/labs/translation/gcc/workflow/translation-global-link.xml b/apps/workflow-server/gcc-workflow-server/src/main/resources/com/coremedia/labs/translation/gcc/workflow/translation-global-link.xml
index e8e16f4a..460190ac 100644
--- a/apps/workflow-server/gcc-workflow-server/src/main/resources/com/coremedia/labs/translation/gcc/workflow/translation-global-link.xml
+++ b/apps/workflow-server/gcc-workflow-server/src/main/resources/com/coremedia/labs/translation/gcc/workflow/translation-global-link.xml
@@ -254,13 +254,6 @@
     </AutomatedTask>
 
     <Switch name="CheckDownloadTranslation" defaultSuccessor="DownloadTranslation">
-      <Case successor="HandleDownloadTranslationError">
-        <!-- if there are errors that are not retried automatically, let the user handle them in the error user task -->
-        <And>
-          <NotEmpty variable="workflowActionIssues"/>
-          <Equal><Get variable="remainingAutomaticRetries"/><Integer value="0"/></Equal>
-        </And>
-      </Case>
       <Case successor="ReviewRedeliveredTranslation">
         <Equal><Get variable="globalLinkSubmissionStatus"/><String value="REDELIVERED"/></Equal>
       </Case>
@@ -273,6 +266,20 @@
       <Case successor="CancelTranslation">
         <Get variable="cancelRequested"/>
       </Case>
+      <!--
+        Must be last option: As all states above signal a "done" state, where
+        we would not expect to retry a download, these must be checked first.
+      -->
+      <Case successor="HandleDownloadTranslationError">
+        <!--
+          If there are errors that are not retried automatically, let the user
+          handle them in the error user task.
+        -->
+        <And>
+          <NotEmpty variable="workflowActionIssues"/>
+          <Equal><Get variable="remainingAutomaticRetries"/><Integer value="0"/></Equal>
+        </And>
+      </Case>
     </Switch>
 
     <UserTask name="HandleDownloadTranslationError" successor="SelectTaskAfterDownloadTranslationError">