diff --git a/framework/core/src/Flarum/Core/Users/User.php b/framework/core/src/Flarum/Core/Users/User.php
index 9790dcd50..a317670bd 100755
--- a/framework/core/src/Flarum/Core/Users/User.php
+++ b/framework/core/src/Flarum/Core/Users/User.php
@@ -103,8 +103,7 @@ class User extends Entity /*implements UserInterface, RemindableInterface*/
 
         if (Auth::guest()) {
             if (! isset($current)) {
-                // $current = new Guest;
-                $current = User::find(1);
+                $current = new Guest;
             }
             return $current;
         }