diff --git a/ext/libstrawberry-common/core/messagehandler.h b/ext/libstrawberry-common/core/messagehandler.h
index 1ba93cb5..e482a67b 100644
--- a/ext/libstrawberry-common/core/messagehandler.h
+++ b/ext/libstrawberry-common/core/messagehandler.h
@@ -111,7 +111,7 @@ class AbstractMessageHandler : public _MessageHandlerBase {
   void AbortAll() override;
 
  private:
-  QMap<qint64, ReplyType*> pending_replies_;
+  QMap<int, ReplyType*> pending_replies_;
 };
 
 template <typename MT>
diff --git a/ext/libstrawberry-common/core/messagereply.h b/ext/libstrawberry-common/core/messagereply.h
index a1a8c25d..cc775b19 100644
--- a/ext/libstrawberry-common/core/messagereply.h
+++ b/ext/libstrawberry-common/core/messagereply.h
@@ -34,7 +34,7 @@ class _MessageReplyBase : public QObject {
  public:
   explicit _MessageReplyBase(QObject *parent = nullptr);
 
-  virtual qint64 id() const = 0;
+  virtual int id() const = 0;
   bool is_finished() const { return finished_; }
   bool is_successful() const { return success_; }
 
@@ -60,7 +60,7 @@ class MessageReply : public _MessageReplyBase {
  public:
   explicit MessageReply(const MessageType &request_message, QObject *parent = nullptr);
 
-  qint64 id() const override { return request_message_.id(); }
+  int id() const override { return request_message_.id(); }
   const MessageType &request_message() const { return request_message_; }
   const MessageType &message() const { return reply_message_; }
 
diff --git a/ext/libstrawberry-common/core/workerpool.h b/ext/libstrawberry-common/core/workerpool.h
index 0fd56743..421e1619 100644
--- a/ext/libstrawberry-common/core/workerpool.h
+++ b/ext/libstrawberry-common/core/workerpool.h
@@ -32,7 +32,7 @@
 #include <QQueue>
 #include <QString>
 #include <QStringList>
-#include <QAtomicInteger>
+#include <QAtomicInt>
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 #  include <QRandomGenerator>
 #endif
@@ -147,7 +147,7 @@ class WorkerPool : public _WorkerPoolBase {
   mutable int next_worker_;
   QList<Worker> workers_;
 
-  QAtomicInteger<qint64> next_id_;
+  QAtomicInt next_id_;
 
   QMutex message_queue_mutex_;
   QQueue<ReplyType*> message_queue_;
@@ -356,7 +356,7 @@ template <typename HandlerType>
 typename WorkerPool<HandlerType>::ReplyType*
 WorkerPool<HandlerType>::NewReply(MessageType *message) {
 
-  const qint64 id = next_id_.fetchAndAddOrdered(1);
+  const int id = next_id_.fetchAndAddOrdered(1);
   message->set_id(id);
 
   return new ReplyType(*message);
diff --git a/ext/libstrawberry-tagreader/tagreadermessages.proto b/ext/libstrawberry-tagreader/tagreadermessages.proto
index 5ec17cdf..5b05a9b7 100644
--- a/ext/libstrawberry-tagreader/tagreadermessages.proto
+++ b/ext/libstrawberry-tagreader/tagreadermessages.proto
@@ -110,7 +110,7 @@ message SaveEmbeddedArtResponse {
 }
 
 message Message {
-  optional int64 id = 1;
+  optional int32 id = 1;
 
   optional ReadFileRequest read_file_request = 2;
   optional ReadFileResponse read_file_response = 3;