diff --git a/api/src/main/java/org/openmrs/module/ugandaemrsync/server/SyncFHIRRecord.java b/api/src/main/java/org/openmrs/module/ugandaemrsync/server/SyncFHIRRecord.java
index 5d5d75d9..f9e8cbf9 100644
--- a/api/src/main/java/org/openmrs/module/ugandaemrsync/server/SyncFHIRRecord.java
+++ b/api/src/main/java/org/openmrs/module/ugandaemrsync/server/SyncFHIRRecord.java
@@ -574,7 +574,10 @@ private String generateFHIRCaseResource(SyncFhirProfile syncFhirProfile, SyncFhi
                     }
 
                     for (Encounter encounter : encounters) {
-                        providerList.add(getProviderFromEncounter(encounter));
+                        Provider provider = getProviderFromEncounter(encounter);
+                        if (provider != null) {
+                            providerList.add(provider);
+                        }
                     }
 
                     if (providerList.size() > 0) {