diff --git a/lib/db/install.php b/lib/db/install.php
index 824813bee76..dbbf77f00ff 100644
--- a/lib/db/install.php
+++ b/lib/db/install.php
@@ -327,6 +327,9 @@ function xmldb_main_install() {
     set_config('themerev', time());
     set_config('jsrev', time());
 
+    // No admin setting for this any more, GD is now required, remove in Moodle 2.6.
+    gdversion('gdversion', 2);
+
     // Install licenses
     require_once($CFG->libdir . '/licenselib.php');
     license_manager::install_licenses();
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index f7a69a81f10..83e9b3ef8ee 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -1758,7 +1758,7 @@ function xmldb_main_upgrade($oldversion) {
 
     if ($oldversion < 2013032200.01) {
         // GD is now always available
-        unset_config('gdversion');
+        set_config('gdversion', 2);
 
         upgrade_main_savepoint(true, 2013032200.01);
     }