diff --git a/src/httpserver/hass.c b/src/httpserver/hass.c
index 2965a272b..c6221f9f4 100644
--- a/src/httpserver/hass.c
+++ b/src/httpserver/hass.c
@@ -219,6 +219,9 @@ HassDeviceInfo* hass_init_device_info(ENTITY_TYPE type, int index, char* payload
 	case VOLTAGE_SENSOR:
 		sprintf(g_hassBuffer, "%s Voltage", CFG_GetShortDeviceName());
 		break;
+	default:
+		sprintf(g_hassBuffer, "%s %i", CFG_GetShortDeviceName(), index);
+		break;
 	}
 	cJSON_AddStringToObject(info->root, "name", g_hassBuffer);
 	cJSON_AddStringToObject(info->root, "~", CFG_GetMQTTClientId());      //base topic