diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 595a1f0ac7a..992219e0b38 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -50,8 +50,8 @@ function xmldb_main_upgrade($oldversion=0) {
         }
     }
 
-    if ($oldversion < 2006101001) {         /// Disable the LAMS module by default
-        if (!count_records('lams')) {
+    if ($oldversion < 2006101001) {         /// Disable the LAMS module by default (if it is installed)
+        if (count_records('modules', 'name', 'lams') && !count_records('lams')) {
             set_field('modules', 'visible', 0, 'name', 'lams');  // Disable it by default
         }
     }