diff --git a/boot.php b/boot.php
index db5903829d..dfd3a20be6 100644
--- a/boot.php
+++ b/boot.php
@@ -591,6 +591,11 @@ function is_ajax() {
 	return (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest');
 }
 
+/**
+ * @brief Function to check if request was an AJAX (xmlhttprequest) request.
+ *
+ * @param $via_worker boolean Is the check run via the poller?
+ */
 function check_db($via_worker) {
 
 	$build = get_config('system', 'build');
diff --git a/include/poller.php b/include/poller.php
index d07107e072..d315042114 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -32,6 +32,9 @@ function poller_run($argv, $argc){
 
 	Config::load();
 
+	// Check the database structure and possibly fixes it
+	check_db(true);
+
 	// Quit when in maintenance
 	if (Config::get('system', 'maintenance', true)) {
 		return;
@@ -890,9 +893,6 @@ function poller_run_cron() {
 }
 
 if (array_search(__file__,get_included_files())===0) {
-	// Check the database structure and possibly fixes it
-	check_db(true);
-
 	poller_run($_SERVER["argv"],$_SERVER["argc"]);
 
 	poller_unclaim_process();