diff --git a/erpnext/schools/doctype/assessment_plan/assessment_plan.js b/erpnext/schools/doctype/assessment_plan/assessment_plan.js
index be628b8..e83c4d3 100644
--- a/erpnext/schools/doctype/assessment_plan/assessment_plan.js
+++ b/erpnext/schools/doctype/assessment_plan/assessment_plan.js
@@ -27,6 +27,14 @@
                 frappe.set_route("Form", "Assessment Result Tool");
             });
         }
+
+		frm.set_query('grading_scale', function(){
+			return {
+				filters: {
+					docstatus: 1
+				}
+			}
+		});
     },
 
 	course: function(frm) {
diff --git a/erpnext/schools/doctype/course/course.js b/erpnext/schools/doctype/course/course.js
index c667eca..e31ba72 100644
--- a/erpnext/schools/doctype/course/course.js
+++ b/erpnext/schools/doctype/course/course.js
@@ -28,4 +28,12 @@
 			frappe.set_route("List", "Assessment Plan");
 		});
 	}
+
+	frm.set_query('default_grading_scale', function(){
+		return {
+			filters: {
+				docstatus: 1
+			}
+		}
+	});
 });
\ No newline at end of file