diff --git a/Web/Resgrid.Web.Services/Controllers/v4/PersonnelController.cs b/Web/Resgrid.Web.Services/Controllers/v4/PersonnelController.cs
index ad369b0a..685924ed 100644
--- a/Web/Resgrid.Web.Services/Controllers/v4/PersonnelController.cs
+++ b/Web/Resgrid.Web.Services/Controllers/v4/PersonnelController.cs
@@ -452,8 +452,17 @@ public static async Task<PersonnelInfoResultData> ConvertPersonnelInfo(IdentityU
 
 				personnelData.StaffingId = userState.State.ToString();
 				personnelData.StaffingTimestamp = userState.Timestamp.TimeConverter(department);
-				personnelData.Staffing = staffing.ButtonText;
-				personnelData.StaffingColor = staffing.ButtonClassToColor();
+
+				if (staffing != null)
+				{
+					personnelData.Staffing = staffing.ButtonText;
+					personnelData.StaffingColor = staffing.ButtonClassToColor();
+				}
+				else
+				{
+					personnelData.Staffing = "Available";
+					personnelData.StaffingColor = "#000";
+				}
 			}
 
 			if (action == null)