diff --git a/apps/ui/templates/room.html b/apps/ui/templates/room.html
index 08790d0..68d270a 100644
--- a/apps/ui/templates/room.html
+++ b/apps/ui/templates/room.html
@@ -379,9 +379,9 @@
                     break;
 
                 case 'thermostat':
-                    if (state.current != null) {
+                    if (state.target != null) {
                         html = `<div class="state-primary">${state.target.toFixed(1)}°C</div>`;
-                        if (state.target != null) {
+                        if (state.current != null) {
                             html += `<div class="state-secondary">Ist: ${state.current}°C</div>`;
                         }
                     }