diff --git a/src/share/database/scripts/cql/dhcpdb_create.cql b/src/share/database/scripts/cql/dhcpdb_create.cql
index 9649d28c25..be163e68cd 100644
--- a/src/share/database/scripts/cql/dhcpdb_create.cql
+++ b/src/share/database/scripts/cql/dhcpdb_create.cql
@@ -260,7 +260,7 @@ INSERT INTO host_identifier_type (type, name) VALUES (4, 'flex-id');
 CREATE TABLE IF NOT EXISTS dhcp_option_scope (
   scope_id int,
   scope_name varchar,
-  PRIMARY KEY ((scope_name))
+  PRIMARY KEY ((scope_id))
 );
 
 INSERT INTO dhcp_option_scope (scope_id, scope_name) VALUES (0, 'global');
diff --git a/src/share/database/scripts/cql/upgrade_1.0_to_2.0.sh.in b/src/share/database/scripts/cql/upgrade_1.0_to_2.0.sh.in
index 5635616383..6e3a34cd7e 100644
--- a/src/share/database/scripts/cql/upgrade_1.0_to_2.0.sh.in
+++ b/src/share/database/scripts/cql/upgrade_1.0_to_2.0.sh.in
@@ -87,7 +87,7 @@ INSERT INTO host_identifier_type (type, name) VALUES (4, 'flex-id');
 CREATE TABLE IF NOT EXISTS dhcp_option_scope (
   scope_id int,
   scope_name varchar,
-  PRIMARY KEY ((scope_name))
+  PRIMARY KEY ((scope_id))
 );
 
 INSERT INTO dhcp_option_scope (scope_id, scope_name) VALUES (0, 'global');