diff --git a/edu-services/gradebook-service/impl/src/java/org/sakaiproject/component/gradebook/GradebookServiceHibernateImpl.java b/edu-services/gradebook-service/impl/src/java/org/sakaiproject/component/gradebook/GradebookServiceHibernateImpl.java
index 876d0963d1d9..790b3b8b5e21 100644
--- a/edu-services/gradebook-service/impl/src/java/org/sakaiproject/component/gradebook/GradebookServiceHibernateImpl.java
+++ b/edu-services/gradebook-service/impl/src/java/org/sakaiproject/component/gradebook/GradebookServiceHibernateImpl.java
@@ -1165,7 +1165,7 @@ private List getTotalPointsEarnedInternal(final String studentId, final Gradeboo
 	        if(gradeRec.getPointsEarned() != null && !gradeRec.getPointsEarned().equals("") && !gradeRec.getDroppedFromGrade())
 	        {
 	            Assignment go = gradeRec.getAssignment();
-	            if (go.isIncludedInCalculations())
+	            if (go.isIncludedInCalculations() && countedAssigns.contains(go))
 	            {
 	                Double pointsEarned = new Double(gradeRec.getPointsEarned());
 	                //if(gbGradeType == GradebookService.GRADE_TYPE_POINTS)
diff --git a/gradebook/app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookCalculationImpl.java b/gradebook/app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookCalculationImpl.java
index 81a4de9a4ba8..45034502e2cc 100644
--- a/gradebook/app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookCalculationImpl.java
+++ b/gradebook/app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookCalculationImpl.java
@@ -226,7 +226,7 @@ List getTotalPointsEarnedInternal(final String studentId, final Gradebook gradeb
 			if(gradeRec.getPointsEarned() != null && !gradeRec.getPointsEarned().equals("") && !gradeRec.getDroppedFromGrade())
 			{
 				Assignment go = gradeRec.getAssignment();
-				if (go.isIncludedInCalculations())
+				if (go.isIncludedInCalculations() && countedAssigns.contains(go))
 				{
 					Double pointsEarned = new Double(gradeRec.getPointsEarned());
 					//if(gbGradeType == GradebookService.GRADE_TYPE_POINTS)