diff --git a/src/IvanCraft623/RankSystem/session/Session.php b/src/IvanCraft623/RankSystem/session/Session.php
index 31128d6..a43774c 100644
--- a/src/IvanCraft623/RankSystem/session/Session.php
+++ b/src/IvanCraft623/RankSystem/session/Session.php
@@ -265,15 +265,13 @@ public function setRank(Rank $rank, ?int $expTime = null) : bool {
 			$rank,
 			$expTime
 		);
-		$ev->call();
-
-		if ($ev->isCancelled()) {
-			return false;
-		}
-
 		$default = $this->plugin->getRankManager()->getDefault();
 		if ($rank === $default || $this->hasRank($rank)) {
 			$ev->cancel();
+		}
+		$ev->call();
+
+		if ($ev->isCancelled()) {
 			return false;
 		}
 
@@ -299,15 +297,13 @@ public function removeRank(Rank $rank) : bool {
 			$this,
 			$rank
 		);
-		$ev->call();
-
-		if ($ev->isCancelled()) {
-			return false;
-		}
-
 		$default = $this->plugin->getRankManager()->getDefault();
 		if ($rank === $default || !$this->hasRank($rank)) {
 			$ev->cancel();
+		}
+		$ev->call();
+
+		if ($ev->isCancelled()) {
 			return false;
 		}