diff --git a/xslt/uddf-export.xslt b/xslt/uddf-export.xslt
index 5037c71e7..6468e8927 100644
--- a/xslt/uddf-export.xslt
+++ b/xslt/uddf-export.xslt
@@ -203,11 +203,13 @@
     <dive id="{generate-id(.)}">
 
       <informationbeforedive>
-        <xsl:if test="temperature/@air|divetemperature/@air != ''">
-          <airtemperature>
-            <xsl:value-of select="format-number(substring-before(temperature/@air|divetemperature/@air, ' ') + 273.15, '0.00')"/>
-          </airtemperature>
-        </xsl:if>
+        <xsl:for-each select="divecomputer">
+          <xsl:if test="temperature/@air|divetemperature/@air != ''">
+            <airtemperature>
+              <xsl:value-of select="format-number(substring-before(temperature/@air|divetemperature/@air, ' ') + 273.15, '0.00')"/>
+            </airtemperature>
+          </xsl:if>
+        </xsl:for-each>
         <datetime>
           <xsl:value-of select="concat(./@date, 'T', ./@time)"/>
         </datetime>