diff --git a/bolt/internal/internal.go b/bolt/internal/internal.go
index 2ce4ca36b..72ffc888c 100644
--- a/bolt/internal/internal.go
+++ b/bolt/internal/internal.go
@@ -685,8 +685,5 @@ func UnmarshalMapping(data []byte, m *chronograf.Mapping) error {
 
 // UnmarshalMappingPB decodes a mapping from binary protobuf data.
 func UnmarshalMappingPB(data []byte, m *Mapping) error {
-	if err := proto.Unmarshal(data, m); err != nil {
-		return err
-	}
-	return nil
+	return proto.Unmarshal(data, m)
 }
diff --git a/server/mapping.go b/server/mapping.go
index 4105e6b9e..872e2a36d 100644
--- a/server/mapping.go
+++ b/server/mapping.go
@@ -23,7 +23,7 @@ MappingsLoop:
 		if applyMapping(mapping, p) {
 			org, err := s.Store.Organizations(ctx).Get(ctx, chronograf.OrganizationQuery{ID: &mapping.Organization})
 			if err != nil {
-				return nil, err
+				continue MappingsLoop
 			}
 
 			for _, role := range roles {