diff --git a/cockatrice/src/client/tabs/tab_account.cpp b/cockatrice/src/client/tabs/tab_account.cpp
index 602eb2f60..7ba292741 100644
--- a/cockatrice/src/client/tabs/tab_account.cpp
+++ b/cockatrice/src/client/tabs/tab_account.cpp
@@ -39,10 +39,7 @@ TabAccount::TabAccount(TabSupervisor *_tabSupervisor, AbstractClient *_client, c
     connect(client, &AbstractClient::removeFromListEventReceived, this, &TabAccount::processRemoveFromListEvent);
 
     PendingCommand *pend = client->prepareSessionCommand(Command_ListUsers());
-    connect(pend,
-            static_cast<void (PendingCommand::*)(const Response &, const CommandContainer &, const QVariant &)>(
-                &PendingCommand::finished),
-            this, &TabAccount::processListUsersResponse);
+    connect(pend, &PendingCommand::finished, this, &TabAccount::processListUsersResponse);
     client->sendCommand(pend);
 
     QVBoxLayout *vbox = new QVBoxLayout;
diff --git a/cockatrice/src/client/tabs/tab_admin.cpp b/cockatrice/src/client/tabs/tab_admin.cpp
index 26c0fa61b..7ef059423 100644
--- a/cockatrice/src/client/tabs/tab_admin.cpp
+++ b/cockatrice/src/client/tabs/tab_admin.cpp
@@ -170,9 +170,7 @@ void TabAdmin::actGrantReplayAccess()
     cmd.set_moderator_name(client->getUserName().toStdString());
 
     auto *pend = client->prepareModeratorCommand(cmd);
-    connect(pend,
-            QOverload<const Response &, const CommandContainer &, const QVariant &>::of(&PendingCommand::finished),
-            this, &TabAdmin::grantReplayAccessProcessResponse);
+    connect(pend, &PendingCommand::finished, this, &TabAdmin::grantReplayAccessProcessResponse);
     client->sendCommand(pend);
 }
 
diff --git a/cockatrice/src/game/game_selector.cpp b/cockatrice/src/game/game_selector.cpp
index ab996e038..62d3957a7 100644
--- a/cockatrice/src/game/game_selector.cpp
+++ b/cockatrice/src/game/game_selector.cpp
@@ -274,8 +274,7 @@ void GameSelector::actJoin()
     }
 
     PendingCommand *pend = r->prepareRoomCommand(cmd);
-    connect(pend, qOverload<const Response &, const CommandContainer &, const QVariant &>(&PendingCommand::finished),
-            this, &GameSelector::checkResponse);
+    connect(pend, &PendingCommand::finished, this, &GameSelector::checkResponse);
     r->sendRoomCommand(pend);
 
     disableButtons();
diff --git a/cockatrice/src/game/zones/view_zone.cpp b/cockatrice/src/game/zones/view_zone.cpp
index 298f37f57..7edabfeb5 100644
--- a/cockatrice/src/game/zones/view_zone.cpp
+++ b/cockatrice/src/game/zones/view_zone.cpp
@@ -77,9 +77,7 @@ void ZoneViewZone::initializeCards(const QList<const ServerInfo_Card *> &cardLis
         cmd.set_is_reversed(isReversed);
 
         PendingCommand *pend = player->prepareGameCommand(cmd);
-        connect(pend,
-                qOverload<const Response &, const CommandContainer &, const QVariant &>(&PendingCommand::finished),
-                this, &ZoneViewZone::zoneDumpReceived);
+        connect(pend, &PendingCommand::finished, this, &ZoneViewZone::zoneDumpReceived);
         player->sendGameCommand(pend);
     } else {
         const CardList &c = origZone->getCards();
diff --git a/cockatrice/src/server/user/user_info_box.cpp b/cockatrice/src/server/user/user_info_box.cpp
index a7857b170..fe9b6c7b2 100644
--- a/cockatrice/src/server/user/user_info_box.cpp
+++ b/cockatrice/src/server/user/user_info_box.cpp
@@ -250,10 +250,8 @@ void UserInfoBox::actPassword()
         cmd.set_user_name(client->getUserName().toStdString());
 
         PendingCommand *pend = client->prepareSessionCommand(cmd);
-        connect(pend,
-                // we need qoverload here in order to select the right version of this function
-                QOverload<const Response &, const CommandContainer &, const QVariant &>::of(&PendingCommand::finished),
-                this, [=, this](const Response &response, const CommandContainer &, const QVariant &) {
+        connect(pend, &PendingCommand::finished, this,
+                [=, this](const Response &response, const CommandContainer &, const QVariant &) {
                     if (response.response_code() == Response::RespOk) {
                         changePassword(oldPassword, newPassword);
                     } else {
diff --git a/cockatrice/src/server/user/user_list_manager.cpp b/cockatrice/src/server/user/user_list_manager.cpp
index b1443b02e..67089cc74 100644
--- a/cockatrice/src/server/user/user_list_manager.cpp
+++ b/cockatrice/src/server/user/user_list_manager.cpp
@@ -51,8 +51,7 @@ void UserListManager::setOwnUserInfo(const ServerInfo_User &userInfo)
 void UserListManager::populateInitialOnlineUsers()
 {
     PendingCommand *pend = client->prepareSessionCommand(Command_ListUsers());
-    connect(pend, qOverload<const Response &, const CommandContainer &, const QVariant &>(&PendingCommand::finished),
-            this, &UserListManager::processListUsersResponse);
+    connect(pend, &PendingCommand::finished, this, &UserListManager::processListUsersResponse);
     client->sendCommand(pend);
 }