diff --git a/fhem/FHEM/31_HUEDevice.pm b/fhem/FHEM/31_HUEDevice.pm
index 302bbe20e..4bd1878f4 100644
--- a/fhem/FHEM/31_HUEDevice.pm
+++ b/fhem/FHEM/31_HUEDevice.pm
@@ -1292,12 +1292,6 @@ HUEDevice_Parse($$)
     }
 
     return undef;
-
-      #Eurotronic Eurotronic Spirit ZigBee (SPZB0001)
-      $readings{heatsetpoint} = $config->{heatsetpoint} * 0.01 if( defined ($config->{heatsetpoint}) );
-      $readings{locked} = $config->{locked}?'true':'false' if( defined ($config->{locked}) );
-      $readings{displayflipped} = $config->{displayflipped}?'true':'false' if( defined ($config->{displayflipped}) );
-      $readings{mode} = $config->{mode} if( defined ($config->{mode}) );
   }
 
   $hash->{modelid} = $result->{modelid} if( defined($result->{modelid}) );
@@ -1330,6 +1324,12 @@ HUEDevice_Parse($$)
 
       #Xiaomi Aqara Vibrationsensor (lumi.vibration.aq1)
       $hash->{sensitivitymax} = $config->{sensitivitymax} if( defined ($config->{sensitivitymax}) );
+
+      #Eurotronic Spirit ZigBee (SPZB0001)
+      $readings{heatsetpoint} = $config->{heatsetpoint} * 0.01 if( defined ($config->{heatsetpoint}) );
+      $readings{locked} = $config->{locked}?'true':'false' if( defined ($config->{locked}) );
+      $readings{displayflipped} = $config->{displayflipped}?'true':'false' if( defined ($config->{displayflipped}) );
+      $readings{mode} = $config->{mode} if( defined ($config->{mode}) );
     }
 
     my $lastupdated = '';
@@ -1364,8 +1364,6 @@ HUEDevice_Parse($$)
         $lastupdated_local = FmtDateTime($sec);
       }else{
 
-      #Eurotronic Eurotronic Spirit ZigBee (SPZB0001)
-      $readings{valve} = ceil((100/255) * $state->{valve}) if( defined ($state->{valve}) );
         $lastupdated_local = $lastupdated;
       }
 
@@ -1398,6 +1396,9 @@ HUEDevice_Parse($$)
       $readings{vibration} = $state->{vibration} if( defined ($state->{vibration}) );
       $readings{orientation} = join(',', @{$state->{orientation}}) if( defined($state->{orientation}) && ref($state->{orientation}) eq 'ARRAY' );
       $readings{vibrationstrength} = $state->{vibrationstrength} if( defined ($state->{vibrationstrength}) );
+
+      #Eurotronic Spirit ZigBee (SPZB0001)
+      $readings{valve} = ceil((100/255) * $state->{valve}) if( defined ($state->{valve}) );
     }
 
     $hash->{lastupdated} = ReadingsVal( $name, '.lastupdated', undef ) if( !$hash->{lastupdated} );