diff --git a/app/Http/Middleware/EligibleForMigration.php b/app/Http/Middleware/EligibleForMigration.php
index 1a8c4e82c525..43141c888d9f 100644
--- a/app/Http/Middleware/EligibleForMigration.php
+++ b/app/Http/Middleware/EligibleForMigration.php
@@ -15,7 +15,7 @@ class EligibleForMigration
      */
     public function handle($request, Closure $next)
     {
-        if (is_null(auth()->user()->public_id)) {
+        if (auth()->user()->eligibleForMigration()) {
             return $next($request);
         }
 
diff --git a/app/Models/User.php b/app/Models/User.php
index e79a31ea4062..b7255d721b86 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -496,7 +496,7 @@ class User extends Authenticatable
 
     public function eligibleForMigration()
     {
-        return is_null($this->public_id);
+        return is_null($this->public_id) || $this->public_id == 0;
     }
 }