diff --git a/code/controllers/subsystems/records.dm b/code/controllers/subsystems/records.dm
index e46f108266b..fcc43b6242f 100644
--- a/code/controllers/subsystems/records.dm
+++ b/code/controllers/subsystems/records.dm
@@ -229,7 +229,7 @@
 		var/isactive = t.physical_status
 
 		var/list/departments
-		if(job.departments.len > 0 && all_in_list(job.departments, manifest))
+		if(istype(job) && job.departments.len > 0 && all_in_list(job.departments, manifest))
 			departments = job.departments
 		else // no department set or there's something weird
 			departments = list(DEPARTMENT_MISCELLANEOUS = JOBROLE_DEFAULT)
diff --git a/html/changelogs/amunak-manifest-runtime.yml b/html/changelogs/amunak-manifest-runtime.yml
new file mode 100755
index 00000000000..5d9c6b8fcd4
--- /dev/null
+++ b/html/changelogs/amunak-manifest-runtime.yml
@@ -0,0 +1,4 @@
+author: Amunak
+delete-after: True
+changes:
+  - bugfix: "Changing someone's rank will no longer cause a runtime that causes Crew Manifest to stop working / show nothing."