diff --git a/app/config/errors.php b/app/config/errors.php
index 02d98635d3..159c806175 100644
--- a/app/config/errors.php
+++ b/app/config/errors.php
@@ -467,7 +467,7 @@ return [
     ],
     Exception::DATABASE_TIMEOUT => [
         'name' => Exception::DATABASE_TIMEOUT,
-        'description' => 'Database timed out.',
+        'description' => 'Database timed out. Try adjusting your queries or adding an index.',
         'code' => 408
     ],
 
diff --git a/app/controllers/general.php b/app/controllers/general.php
index 8a5e56e9a3..0a67148576 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -694,7 +694,7 @@ App::error()
             $code = $error->getCode();
             $message = $error->getMessage();
         } elseif ($error instanceof Utopia\Database\Exception\Timeout) {
-            $error = new AppwriteException(AppwriteException::DATABASE_TIMEOUT, $message, previous: $error);
+            $error = new AppwriteException(AppwriteException::DATABASE_TIMEOUT, previous: $error);
             $code = $error->getCode();
             $message = $error->getMessage();
         }