diff --git a/lib/cadet/assessments/assessments.ex b/lib/cadet/assessments/assessments.ex
index 4c326f4d0..b40b42368 100644
--- a/lib/cadet/assessments/assessments.ex
+++ b/lib/cadet/assessments/assessments.ex
@@ -1465,7 +1465,7 @@ defmodule Cadet.Assessments do
         ans_xp
         |> subquery
         |> select([a], %{
-          total_xp: sum(a.total_xp)
+          total_xp: coalesce(sum(a.total_xp), 0)
         })
         |> Repo.one()
 
@@ -1476,15 +1476,8 @@ defmodule Cadet.Assessments do
           submission.submitted_at
         end
 
-      xp =
-        if is_integer(total.total_xp) do
-          total.total_xp
-        else
-          decimal_to_integer(total.total_xp)
-        end
-
       xp_bonus =
-        if xp <= 0 do
+        if total.total_xp <= 0 do
           0
         else
           if Timex.before?(cur_time, Timex.shift(assessment.open_at, hours: early_hours)) do