diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java
index 6f13a93..2c09554 100644
--- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java
+++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java
@@ -42,7 +42,8 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
 
         boolean destinationReached = false;
         notifyOriginProcessed(data.getOrigin());
-        while (!destinationReached && !this.heap.isEmpty() && currentLabel != null) {
+        while (!destinationReached && !this.heap.isEmpty()) {
+            currentLabel = this.heap.deleteMin();
             if (currentLabel.getTotalCost() == Double.MAX_VALUE)
                 break;
             
@@ -81,7 +82,6 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
                         }
                     }
                 }
-                currentLabel = heap.deleteMin();
             }
         }