diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index aaf4b56513e..1f36d622aea 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -73,6 +73,10 @@ Release 2.9.0 - UNRELEASED
     YARN-4655. Log uncaught exceptions/errors in various thread pools in YARN.
     (Sidharta Seethana via vvasudev)
 
+    YARN-4689. FairScheduler: Cleanup preemptContainer to be more readable.
+    (Kai Sasaki via kasha)
+
+
   OPTIMIZATIONS
 
   BUG FIXES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSParentQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSParentQueue.java
index a028422220e..d9fac905de5 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSParentQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSParentQueue.java
@@ -266,10 +266,8 @@ public class FSParentQueue extends FSQueue {
             LOG.debug("skipping from queue=" + getName()
                 + " because it's a non-preemptable queue");
           }
-          continue;
-        }
-        if (candidateQueue == null ||
-            comparator.compare(queue, candidateQueue) > 0) {
+        } else if (candidateQueue == null ||
+                  comparator.compare(queue, candidateQueue) > 0) {
           candidateQueue = queue;
         }
       }