diff --git a/src/nomad_measurements/xrd/schema.py b/src/nomad_measurements/xrd/schema.py
index 744dbba0..3aa21f6b 100644
--- a/src/nomad_measurements/xrd/schema.py
+++ b/src/nomad_measurements/xrd/schema.py
@@ -885,13 +885,14 @@ def normalize(self, archive: 'EntryArchive', logger: 'BoundLogger'):
         if not archive.results.properties.structural:
             diffraction_patterns = []
             for result in self.results:
-                if len(result.intensity.shape) == 1:
+                intensity = get_data(result, 'intensity')
+                if len(intensity.shape) == 1:
                     diffraction_patterns.append(
                         DiffractionPattern(
                             incident_beam_wavelength=result.source_peak_wavelength,
-                            two_theta_angles=result.two_theta,
+                            two_theta_angles=get_data(result, 'two_theta'),
                             intensity=result.intensity,
-                            q_vector=result.q_norm,
+                            q_vector=get_data(result, 'q_norm'),
                         )
                     )
             archive.results.properties.structural = StructuralProperties(