diff --git a/etc/schema/mysql-upgrades/2.11.0.sql b/etc/schema/mysql-upgrades/2.11.0.sql
index 1a8c0b4d6..648821e73 100644
--- a/etc/schema/mysql-upgrades/2.11.0.sql
+++ b/etc/schema/mysql-upgrades/2.11.0.sql
@@ -18,11 +18,10 @@ ALTER TABLE `icingaweb_user_preference`
 CREATE TABLE `icingaweb_config_scope`(
     `id`     int(10) unsigned NOT NULL AUTO_INCREMENT,
     `module` varchar(254) NOT NULL DEFAULT 'default',
-    `type`   varchar(64) NOT NULL,
     `name`   varchar(254) COLLATE utf8mb4_unicode_ci NOT NULL,
     `hash`   binary(20) NOT NULL COMMENT 'sha1(all option tuples)',
     PRIMARY KEY (`id`),
-    UNIQUE KEY `idx_module_type_name` (`module`, `type`, `name`)
+    UNIQUE KEY `idx_module_name` (`module`, `name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE `icingaweb_config_option`(
diff --git a/etc/schema/mysql.schema.sql b/etc/schema/mysql.schema.sql
index ea6158165..21938865a 100644
--- a/etc/schema/mysql.schema.sql
+++ b/etc/schema/mysql.schema.sql
@@ -56,11 +56,10 @@ CREATE TABLE `icingaweb_rememberme`(
 CREATE TABLE `icingaweb_config_scope`(
   `id`     int(10) unsigned NOT NULL AUTO_INCREMENT,
   `module` varchar(254) NOT NULL DEFAULT 'default',
-  `type`   varchar(64) NOT NULL,
   `name`   varchar(254) COLLATE utf8mb4_unicode_ci NOT NULL,
   `hash`   binary(20) NOT NULL COMMENT 'sha1(all option tuples)',
   PRIMARY KEY (`id`),
-  UNIQUE KEY `idx_module_type_name` (`module`, `type`, `name`)
+  UNIQUE KEY `idx_module_name` (`module`, `name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE `icingaweb_config_option`(
diff --git a/etc/schema/pgsql-upgrades/2.11.0.sql b/etc/schema/pgsql-upgrades/2.11.0.sql
index 939010ab0..71f23646c 100644
--- a/etc/schema/pgsql-upgrades/2.11.0.sql
+++ b/etc/schema/pgsql-upgrades/2.11.0.sql
@@ -4,7 +4,6 @@ CREATE DOMAIN bytea20 AS bytea CONSTRAINT exactly_20_bytes_long CHECK ( VALUE IS
 CREATE TABLE "icingaweb_config_scope" (
   "id"     serial,
   "module" character varying(254) NOT NULL DEFAULT 'default',
-  "type"   character varying(64) NOT NULL,
   "name"   citext NOT NULL,
   "hash"   bytea20 NOT NULL
 );
@@ -17,11 +16,10 @@ ALTER TABLE ONLY "icingaweb_config_scope"
     "id"
 );
 
-CREATE UNIQUE INDEX idx_module_type_name
+CREATE UNIQUE INDEX idx_module_name
   ON "icingaweb_config_scope"
   USING btree (
     lower((module)::text),
-    lower((type)::text),
     lower((name)::text)
 );
 
diff --git a/etc/schema/pgsql.schema.sql b/etc/schema/pgsql.schema.sql
index 5533f6d41..c162b1013 100644
--- a/etc/schema/pgsql.schema.sql
+++ b/etc/schema/pgsql.schema.sql
@@ -124,7 +124,6 @@ ALTER TABLE ONLY "icingaweb_rememberme"
 CREATE TABLE "icingaweb_config_scope" (
   "id"     serial,
   "module" character varying(254) NOT NULL DEFAULT 'default',
-  "type"   character varying(64) NOT NULL,
   "name"   citext NOT NULL,
   "hash"   bytea20 NOT NULL
 );
@@ -137,11 +136,10 @@ ALTER TABLE ONLY "icingaweb_config_scope"
     "id"
 );
 
-CREATE UNIQUE INDEX idx_module_type_name
+CREATE UNIQUE INDEX idx_module_name
   ON "icingaweb_config_scope"
   USING btree (
     lower((module)::text),
-    lower((type)::text),
     lower((name)::text)
 );
 
diff --git a/library/Icinga/Model/ConfigScope.php b/library/Icinga/Model/ConfigScope.php
index e90d35a3a..4084502cf 100644
--- a/library/Icinga/Model/ConfigScope.php
+++ b/library/Icinga/Model/ConfigScope.php
@@ -29,7 +29,6 @@ class ConfigScope extends Model
     {
         return [
             'module',
-            'type',
             'name',
             'hash'
         ];
@@ -39,7 +38,6 @@ class ConfigScope extends Model
     {
         return [
             'module'    => t('Config Scope Module'),
-            'type'      => t('Config Scope Type'),
             'name'      => t('Config Scope Name'),
             'hash'      => t('Config Scope Hash')
         ];