diff --git a/models/base/xapi_events_all_parsed.sql b/models/base/xapi_events_all_parsed.sql
index ce884958..694a71be 100644
--- a/models/base/xapi_events_all_parsed.sql
+++ b/models/base/xapi_events_all_parsed.sql
@@ -15,15 +15,26 @@ SELECT
         JSON_VALUE(event_str, '$.actor.mbox_sha1sum')
     ) as actor_id,
     JSON_VALUE(event_str, '$.object.id') as object_id,
-    -- If the contextActivities parent is a course, use that. Otherwise use the object id for the course id
-    if(
+    -- If the contextActivities parent is a course, use that. It can be a "course"
+    -- type, or a "cmi.interaction" type for multiple question problem submissions.
+    -- Otherwise use the object id for the course id.
+    multiIf(
+        -- If the contextActivities parent is a course, use that
         JSON_VALUE(
             event_str,
-            '$.context.contextActivities.parent[0].definition.type')
-                = 'http://adlnet.gov/expapi/activities/course',
-            JSON_VALUE(event_str, '$.context.contextActivities.parent[0].id'),
-            JSON_VALUE(event_str, '$.object.id')
-        ) as course_id,
+            '$.context.contextActivities.parent[0].definition.type'
+        ) = 'http://adlnet.gov/expapi/activities/course',
+        JSON_VALUE(event_str, '$.context.contextActivities.parent[0].id'),
+        -- Else if the contextActivities parent is a GroupActivity, it's a multi
+        -- question problem and we use the grouping id
+        JSON_VALUE(
+            event_str,
+            '$.context.contextActivities.parent[0].objectType'
+        ) in ('Activity', 'GroupActivity'),
+        JSON_VALUE(event_str, '$.context.contextActivities.grouping[0].id'),
+        -- Otherwise use the object id
+        JSON_VALUE(event_str, '$.object.id')
+    ) as course_id,
     coalesce(get_org_from_course_url(course_id), '') as org,
     emission_time as emission_time,
     event_str as event_str