diff --git a/src/routes/api.cr b/src/routes/api.cr
index 1e15918..7d2af12 100644
--- a/src/routes/api.cr
+++ b/src/routes/api.cr
@@ -963,7 +963,13 @@ struct APIRouter
     Koa.tags ["admin", "mangadex"]
     get "/api/admin/mangadex/search" do |env|
       begin
-        token, expires = Storage.default.get_md_token get_username env
+        username = get_username env
+        token, expires = Storage.default.get_md_token username
+
+        unless expires && token
+          raise "No token found for user #{username}"
+        end
+
         client = MangaDex::Client.from_config
         client.token = token
         client.token_expires = expires
diff --git a/src/storage.cr b/src/storage.cr
index 1d47d3f..88a5142 100644
--- a/src/storage.cr
+++ b/src/storage.cr
@@ -530,9 +530,9 @@ class Storage
     end
   end
 
-  def get_md_token(username) : Tuple(String?, Time)
+  def get_md_token(username) : Tuple(String?, Time?)
     token = nil
-    expires = Time.utc
+    expires = nil
     MainFiber.run do
       get_db do |db|
         db.query_one? "select token, expire from md_account where " \