diff --git a/src/mibew/libs/classes/Mibew/Controller/Settings/FeaturesController.php b/src/mibew/libs/classes/Mibew/Controller/Settings/FeaturesController.php
index a7bfa1d1..e0590c59 100644
--- a/src/mibew/libs/classes/Mibew/Controller/Settings/FeaturesController.php
+++ b/src/mibew/libs/classes/Mibew/Controller/Settings/FeaturesController.php
@@ -111,6 +111,7 @@ class FeaturesController extends AbstractController
             'showonlineoperators',
             'enablecaptcha',
             'trackoperators',
+            'autocheckupdates',
         );
     }
 }
diff --git a/src/mibew/libs/classes/Mibew/Maintenance/CronWorker.php b/src/mibew/libs/classes/Mibew/Maintenance/CronWorker.php
index 55a6b405..1120909d 100644
--- a/src/mibew/libs/classes/Mibew/Maintenance/CronWorker.php
+++ b/src/mibew/libs/classes/Mibew/Maintenance/CronWorker.php
@@ -97,14 +97,16 @@ class CronWorker
             $dispatcher = EventDispatcher::getInstance();
             $dispatcher->triggerEvent(Events::CRON_RUN);
 
-            // Run the update checker
-            if (!$this->updateChecker->run()) {
-                $this->errors = array_merge(
-                    $this->errors,
-                    $this->updateChecker->getErrors()
-                );
+            if (Settings::get('autocheckupdates') == '1') {
+                // Run the update checker
+                if (!$this->updateChecker->run()) {
+                    $this->errors = array_merge(
+                        $this->errors,
+                        $this->updateChecker->getErrors()
+                    );
 
-                return false;
+                    return false;
+                }
             }
         } catch (\Exception $e) {
             $this->log[] = $e->getMessage();
diff --git a/src/mibew/libs/classes/Mibew/Settings.php b/src/mibew/libs/classes/Mibew/Settings.php
index 548d206a..dca40a87 100644
--- a/src/mibew/libs/classes/Mibew/Settings.php
+++ b/src/mibew/libs/classes/Mibew/Settings.php
@@ -97,6 +97,7 @@ class Settings
             'surveyaskgroup' => '1',
             'surveyaskmessage' => '0',
             'enablepopupnotification' => '0',
+            'autocheckupdates' => '1', /* Check updates automatically */
             'showonlineoperators' => '0',
             'enablecaptcha' => '0',
             'online_timeout' => 30, /* Timeout (in seconds) when online operator becomes offline */
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/settings_features.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/settings_features.handlebars
index d5ee494e..86723908 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/settings_features.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/settings_features.handlebars
@@ -172,6 +172,15 @@
                                 <br clear="all"/>
                             </div>
 
+                            <div class="field">
+                                <label for="autocheck-updates" class="field-label">{{l10n "Check updates automatically"}}</label>
+                                <div class="field-value">
+                                    <input id="autocheck-updates" type="checkbox" name="autocheckupdates" value="on"{{#if formautocheckupdates}} checked="checked"{{/if}}{{#unless canmodify}} disabled="disabled"{{/unless}}/>
+                                </div>
+                                <label for="autocheck-updates" class="field-description"> &mdash; {{l10n "System will check updates for the core and plugins automatically using cron"}}</label>
+                                <br clear="all"/>
+                            </div>
+
                             {{#if canmodify}}
                                 <div class="form-button">
                                     <input type="submit" name="save" class="submit-button-background save-button" value="{{l10n "Save"}}"/>