diff --git a/src/gvmd.c b/src/gvmd.c
index 5c9cb3f81..0db2efe6d 100644
--- a/src/gvmd.c
+++ b/src/gvmd.c
@@ -1851,6 +1851,8 @@ gvmd (int argc, char** argv)
   static int feed_lock_timeout = 0;
   static gchar *vt_verification_collation = NULL;
 
+  GString *full_disable_commands = g_string_new ("");
+
   int sentry_initialized;
   GError *error = NULL;
   lockfile_t lockfile_checking, lockfile_serving;
@@ -3062,7 +3064,18 @@ gvmd (int argc, char** argv)
   /* Setup global variables. */
 
   if (disable)
-    disabled_commands = g_strsplit (disable, ",", 0);
+    g_string_append (full_disable_commands, disable);
+
+#ifndef HAS_LIBTHEIA
+  if (full_disable_commands->len)
+    g_string_append_c (full_disable_commands, ',');
+  g_string_append (full_disable_commands, "get_license,modify_license");
+#endif
+
+  if (full_disable_commands->len)
+    disabled_commands = g_strsplit (full_disable_commands->str, ",", 0);
+
+  g_string_free(full_disable_commands, TRUE);
 
   scheduling_enabled = (disable_scheduling == FALSE);
 
diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index 03c6e74d1..8c6e2fc70 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -12606,6 +12606,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <p>
         The client uses the get_license command to get the current license.
       </p>
+      <p>
+        This command is only available if gvmd is built with the licensing
+        library (libtheia).
+      </p>
     </description>
     <pattern>
     </pattern>
@@ -23812,6 +23816,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <p>
         The license has to be provided as a valid license TOML file.
       </p>
+      <p>
+        This command is only available if gvmd is built with the licensing
+        library (libtheia).
+      </p>
     </description>
     <pattern>
       <attrib>