diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index c837034..6a14569 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -429,4 +429,5 @@
 erpnext.patches.v8_5.update_existing_data_in_project_type
 erpnext.patches.v8_5.update_customer_group_in_POS_profile
 erpnext.patches.v8_6.update_timesheet_company_from_PO
-erpnext.patches.v8_6.set_write_permission_for_quotation_for_sales_manager
\ No newline at end of file
+erpnext.patches.v8_6.set_write_permission_for_quotation_for_sales_manager
+erpnext.patches.v8_5.remove_project_type_property_setter
\ No newline at end of file
diff --git a/erpnext/patches/v8_5/remove_project_type_property_setter.py b/erpnext/patches/v8_5/remove_project_type_property_setter.py
new file mode 100644
index 0000000..11db783
--- /dev/null
+++ b/erpnext/patches/v8_5/remove_project_type_property_setter.py
@@ -0,0 +1,17 @@
+import frappe
+
+def execute():
+	ps = frappe.db.get_value('Property Setter', dict(doc_type='Project', field_name='project_type',
+		property='options'))
+	if ps:
+		frappe.delete_doc('Property Setter', ps)
+
+	project_types = frappe.db.sql_list('select distinct project_type from tabProject')
+
+	for project_type in project_types:
+		if not frappe.db.exists("Project Type", project_type):
+			p_type = frappe.get_doc({
+				"doctype": "Project Type",
+				"project_type": project_type
+			})
+			p_type.insert()
\ No newline at end of file