diff --git a/cockatrice/src/client/network/release_channel.cpp b/cockatrice/src/client/network/release_channel.cpp
index edcb8d240..e780ebb73 100644
--- a/cockatrice/src/client/network/release_channel.cpp
+++ b/cockatrice/src/client/network/release_channel.cpp
@@ -21,11 +21,8 @@
 
 #define GIT_SHORT_HASH_LEN 7
 
-int ReleaseChannel::sharedIndex = 0;
-
 ReleaseChannel::ReleaseChannel() : netMan(new QNetworkAccessManager(this)), response(nullptr), lastRelease(nullptr)
 {
-    index = sharedIndex++;
 }
 
 ReleaseChannel::~ReleaseChannel()
diff --git a/cockatrice/src/client/network/release_channel.h b/cockatrice/src/client/network/release_channel.h
index f9507b858..359bf2310 100644
--- a/cockatrice/src/client/network/release_channel.h
+++ b/cockatrice/src/client/network/release_channel.h
@@ -82,9 +82,6 @@ public:
     ~ReleaseChannel() override;
 
 protected:
-    // shared by all instances
-    static int sharedIndex;
-    int index;
     QNetworkAccessManager *netMan;
     QNetworkReply *response;
     Release *lastRelease;
@@ -94,10 +91,6 @@ protected:
     virtual QString getReleaseChannelUrl() const = 0;
 
 public:
-    int getIndex() const
-    {
-        return index;
-    }
     Release *getLastRelease()
     {
         return lastRelease;
diff --git a/cockatrice/src/dialogs/dlg_settings.cpp b/cockatrice/src/dialogs/dlg_settings.cpp
index 9b9794503..d72ba992e 100644
--- a/cockatrice/src/dialogs/dlg_settings.cpp
+++ b/cockatrice/src/dialogs/dlg_settings.cpp
@@ -174,8 +174,9 @@ GeneralSettingsPage::GeneralSettingsPage()
     GeneralSettingsPage::retranslateUi();
 
     // connect the ReleaseChannel combo box only after the entries are inserted in retranslateUi
-    connect(&updateReleaseChannelBox, SIGNAL(currentIndexChanged(int)), &settings, SLOT(setUpdateReleaseChannel(int)));
-    updateReleaseChannelBox.setCurrentIndex(settings.getUpdateReleaseChannel()->getIndex());
+    connect(&updateReleaseChannelBox, SIGNAL(currentIndexChanged(int)), &settings,
+            SLOT(setUpdateReleaseChannelIndex(int)));
+    updateReleaseChannelBox.setCurrentIndex(settings.getUpdateReleaseChannelIndex());
 
     setLayout(mainLayout);
 }
@@ -309,7 +310,7 @@ void GeneralSettingsPage::retranslateUi()
     int oldIndex = updateReleaseChannelBox.currentIndex();
     updateReleaseChannelBox.clear();
     for (ReleaseChannel *chan : settings.getUpdateReleaseChannels()) {
-        updateReleaseChannelBox.insertItem(chan->getIndex(), tr(chan->getName().toUtf8()));
+        updateReleaseChannelBox.addItem(tr(chan->getName().toUtf8()));
     }
     updateReleaseChannelBox.setCurrentIndex(oldIndex);
 }
diff --git a/cockatrice/src/settings/cache_settings.cpp b/cockatrice/src/settings/cache_settings.cpp
index 618892044..29fec11ac 100644
--- a/cockatrice/src/settings/cache_settings.cpp
+++ b/cockatrice/src/settings/cache_settings.cpp
@@ -1139,9 +1139,9 @@ void SettingsCache::setDownloadSpoilerStatus(bool _spoilerStatus)
     emit downloadSpoilerStatusChanged();
 }
 
-void SettingsCache::setUpdateReleaseChannel(int _updateReleaseChannel)
+void SettingsCache::setUpdateReleaseChannelIndex(int value)
 {
-    updateReleaseChannel = _updateReleaseChannel;
+    updateReleaseChannel = value;
     settings->setValue("personal/updatereleasechannel", updateReleaseChannel);
 }
 
diff --git a/cockatrice/src/settings/cache_settings.h b/cockatrice/src/settings/cache_settings.h
index a15194b3d..b62addd1e 100644
--- a/cockatrice/src/settings/cache_settings.h
+++ b/cockatrice/src/settings/cache_settings.h
@@ -290,6 +290,10 @@ public:
     {
         return seenTips;
     }
+    int getUpdateReleaseChannelIndex() const
+    {
+        return updateReleaseChannel;
+    }
     ReleaseChannel *getUpdateReleaseChannel() const
     {
         return releaseChannels.at(qMax(0, updateReleaseChannel));
@@ -712,7 +716,7 @@ public slots:
     void setCheckUpdatesOnStartup(QT_STATE_CHANGED_T value);
     void setNotifyAboutUpdate(QT_STATE_CHANGED_T _notifyaboutupdate);
     void setNotifyAboutNewVersion(QT_STATE_CHANGED_T _notifyaboutnewversion);
-    void setUpdateReleaseChannel(int _updateReleaseChannel);
+    void setUpdateReleaseChannelIndex(int value);
     void setMaxFontSize(int _max);
 };
 
diff --git a/dbconverter/src/mocks.cpp b/dbconverter/src/mocks.cpp
index 58ed79bf5..016f5073f 100644
--- a/dbconverter/src/mocks.cpp
+++ b/dbconverter/src/mocks.cpp
@@ -321,7 +321,7 @@ void SettingsCache::setNotifyAboutNewVersion(QT_STATE_CHANGED_T /* _notifyaboutn
 void SettingsCache::setDownloadSpoilerStatus(bool /* _spoilerStatus */)
 {
 }
-void SettingsCache::setUpdateReleaseChannel(int /* _updateReleaseChannel */)
+void SettingsCache::setUpdateReleaseChannelIndex(int /* value */)
 {
 }
 void SettingsCache::setMaxFontSize(int /* _max */)
diff --git a/tests/carddatabase/mocks.cpp b/tests/carddatabase/mocks.cpp
index cfa2e947d..6dbe05304 100644
--- a/tests/carddatabase/mocks.cpp
+++ b/tests/carddatabase/mocks.cpp
@@ -325,7 +325,7 @@ void SettingsCache::setNotifyAboutNewVersion(QT_STATE_CHANGED_T /* _notifyaboutn
 void SettingsCache::setDownloadSpoilerStatus(bool /* _spoilerStatus */)
 {
 }
-void SettingsCache::setUpdateReleaseChannel(int /* _updateReleaseChannel */)
+void SettingsCache::setUpdateReleaseChannelIndex(int /* value */)
 {
 }
 void SettingsCache::setMaxFontSize(int /* _max */)