diff --git a/src/ebusd/mqtthandler.cpp b/src/ebusd/mqtthandler.cpp
index 9c368cf7..82ff3878 100644
--- a/src/ebusd/mqtthandler.cpp
+++ b/src/ebusd/mqtthandler.cpp
@@ -560,7 +560,7 @@ void MqttHandler::handleTraffic() {
   }
 }
 
-string MqttHandler::getTopic(Message* message, signed char fieldIndex) {
+string MqttHandler::getTopic(Message* message, ssize_t fieldIndex) {
   ostringstream ret;
   for (size_t i = 0; i < m_topicStrs.size(); i++) {
     ret << m_topicStrs[i];
@@ -586,7 +586,7 @@ void MqttHandler::publishMessage(Message* message, ostringstream& updates) {
     return;
   }
   if (m_publishByField) {
-    signed char index = 0;
+    ssize_t index = 0;
     istringstream input(updates.str());
     string token;
     while (getline(input, token, UI_FIELD_SEPARATOR)) {
diff --git a/src/ebusd/mqtthandler.h b/src/ebusd/mqtthandler.h
index 7e9ce314..c9036dd7 100644
--- a/src/ebusd/mqtthandler.h
+++ b/src/ebusd/mqtthandler.h
@@ -98,7 +98,7 @@ class MqttHandler : public DataSink, public DataSource, public Thread {
    * @param fieldIndex the optional field index for the field column, or -1.
    * @return the topic string.
    */
-  string getTopic(Message* message, signed char fieldIndex = -1);
+  string getTopic(Message* message, ssize_t fieldIndex = -1);
 
   /**
    * Prepare a @a Message and publish as topic.