diff --git a/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/dto/GetParameterValuesDTO.java b/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/dto/GetParameterValuesDTO.java
index bab0e0a746e..60305d5816c 100644
--- a/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/dto/GetParameterValuesDTO.java
+++ b/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/dto/GetParameterValuesDTO.java
@@ -53,8 +53,8 @@ public class GetParameterValuesDTO {
         this.values = values;
     }
 
-    public Boolean getIsNewJobCreated() {
-        return isNewJobCreated;
+    public boolean getIsNewJobCreated() {
+        return isNewJobCreated != null ? isNewJobCreated : false;
     }
 
     public void setIsNewJobCreated(Boolean isNewJobCreated) {
diff --git a/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/handler/WolfSmartsetUnitThingHandler.java b/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/handler/WolfSmartsetUnitThingHandler.java
index 47332440f6a..8a6d69f96c1 100644
--- a/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/handler/WolfSmartsetUnitThingHandler.java
+++ b/bundles/org.openhab.binding.wolfsmartset/src/main/java/org/openhab/binding/wolfsmartset/internal/handler/WolfSmartsetUnitThingHandler.java
@@ -184,7 +184,7 @@ public class WolfSmartsetUnitThingHandler extends BaseThingHandler {
      */
     public void updateValues(@Nullable GetParameterValuesDTO values) {
         var thingId = thing.getUID();
-        if (values != null && values.getValues() != null && values.getValues().size() > 0) {
+        if (values != null && values.getValues() != null && !values.getValues().isEmpty()) {
             if (!values.getIsNewJobCreated()) {
                 lastRefreshTime = Instant.now();
             }