diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
index ffdfb36126f..fc1cd521f21 100755
--- a/setup/db/create-schema.sql
+++ b/setup/db/create-schema.sql
@@ -633,7 +633,7 @@ CREATE TABLE `cloud`.`port_forwarding_rules` (
   `dest_port_end` int(10) NOT NULL COMMENT 'end port of the the port range to map to',
   PRIMARY KEY (`id`),
   CONSTRAINT `fk_port_forwarding_rules__id` FOREIGN KEY(`id`) REFERENCES `firewall_rules`(`id`) ON DELETE CASCADE,
-  INDEX `i_port_forwarding_rules__instance_id`(`instance_id`)
+  CONSTRAINT `fk_port_forwarding_rules__instance_id` FOREIGN KEY `fk_port_forwarding_rules__instance_id` (`instance_id`) REFERENCES `vm_instance` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE  `cloud`.`host` (
diff --git a/setup/db/db/schema-228to229.sql b/setup/db/db/schema-228to229.sql
index 04033f3a271..d2033063be6 100755
--- a/setup/db/db/schema-228to229.sql
+++ b/setup/db/db/schema-228to229.sql
@@ -46,6 +46,8 @@ ALTER TABLE `cloud`.`configuration` ADD INDEX `i_configuration__name` (`name`);
 ALTER TABLE `cloud`.`configuration` ADD INDEX `i_configuration__category` (`category`);
 ALTER TABLE `cloud`.`configuration` ADD INDEX `i_configuration__component` (`component`);
 
+ALTER TABLE `cloud`.`port_forwarding_rules` ADD CONSTRAINT `fk_port_forwarding_rules__instance_id` FOREIGN KEY `fk_port_forwarding_rules__instance_id` (`instance_id`) REFERENCES `vm_instance` (`id`) ON DELETE CASCADE;
+
 INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-server', 'agent.load.threshold', '0.70', 'Percentage (as a value between 0 and 1) of connected agents after which agent load balancing will start happening');
 INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.visibility', 'global', 'Load Balancer(haproxy) stats visibilty, it can be global,guest-network,disabled');
 INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.uri','/admin?stats','Load Balancer(haproxy) uri.');