diff --git a/app/models/user.rb b/app/models/user.rb
index a6f1d77..d3bec38 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -274,7 +274,7 @@
   # generates a new token for the user unless the user already has a token.
   # modifies the user's model.
   def keep_or_generate_token!
-    if api_token.empty?
+    if api_token.nil? || api_token.empty?
       self.api_token = loop do
         random_token = SecureRandom.urlsafe_base64(nil, false)
         break random_token unless User.exists?(api_token: random_token)