diff --git a/src/device-types/HASelect.cpp b/src/device-types/HASelect.cpp
index f953673..b4bff01 100644
--- a/src/device-types/HASelect.cpp
+++ b/src/device-types/HASelect.cpp
@@ -174,7 +174,7 @@ bool HASelect::publishState(const int8_t state)
         return false;
     }
 
-    if (state == -1) {
+    if (state < 0) {
         return publishOnDataTopic(AHATOFSTR(HAStateTopic), AHATOFSTR(HAStateNone), true);
     }
 
diff --git a/src/utils/HASerializerArray.cpp b/src/utils/HASerializerArray.cpp
index cc920ae..20446f0 100644
--- a/src/utils/HASerializerArray.cpp
+++ b/src/utils/HASerializerArray.cpp
@@ -30,7 +30,7 @@ bool HASerializerArray::add(ItemType item)
 
 const char* HASerializerArray::getItem(const uint8_t index) const
 {
-    if (index < 0 || index >= _itemsNb) {
+    if (index >= _itemsNb) {
         return nullptr;
     }