diff --git a/src/base/bittorrent/torrenthandleimpl.cpp b/src/base/bittorrent/torrenthandleimpl.cpp
index 3aa72e760..f9928584a 100644
--- a/src/base/bittorrent/torrenthandleimpl.cpp
+++ b/src/base/bittorrent/torrenthandleimpl.cpp
@@ -777,10 +777,10 @@ void TorrentHandleImpl::updateState()
     {
         if (isPaused())
             m_state = TorrentState::PausedDownloading;
-        else if (m_nativeStatus.state == lt::torrent_status::downloading_metadata)
-            m_state = TorrentState::DownloadingMetadata;
         else if (m_session->isQueueingSystemEnabled() && isQueued())
             m_state = TorrentState::QueuedDownloading;
+        else if (m_nativeStatus.state == lt::torrent_status::downloading_metadata) // must come after queue check
+            m_state = TorrentState::DownloadingMetadata;
         else if (isForced())
             m_state = TorrentState::ForcedDownloading;
         else if (m_nativeStatus.download_payload_rate > 0)