diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java
index d18a5f6858c..a8084451cbe 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java
@@ -340,13 +340,16 @@ protected void recoverApplication(ApplicationStateData appState,
   private RMAppImpl createAndPopulateNewRMApp(
       ApplicationSubmissionContext submissionContext, long submitTime,
       String user, boolean isRecovery) throws YarnException {
-    // Do queue mapping
     if (!isRecovery) {
+      // Do queue mapping
       if (rmContext.getQueuePlacementManager() != null) {
         // We only do queue mapping when it's a new application
         rmContext.getQueuePlacementManager().placeApplication(
             submissionContext, user);
       }
+      // fail the submission if configured application timeout value is invalid
+      RMServerUtils.validateApplicationTimeouts(
+          submissionContext.getApplicationTimeouts());
     }
     
     ApplicationId applicationId = submissionContext.getApplicationId();
@@ -388,10 +391,6 @@ private RMAppImpl createAndPopulateNewRMApp(
       }
     }
 
-    // fail the submission if configured application timeout value is invalid
-    RMServerUtils.validateApplicationTimeouts(
-        submissionContext.getApplicationTimeouts());
-
     // Create RMApp
     RMAppImpl application = new RMAppImpl(applicationId, rmContext, this.conf,
         submissionContext.getApplicationName(), user,