Index: source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
===================================================================
--- source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -939,11 +939,15 @@
 
             if (m_gdb_comm.SendPacketAndWaitForResponse("?", 1, m_last_stop_packet, false) == GDBRemoteCommunication::PacketResult::Success)
             {
-                if (!m_target.GetArchitecture().IsValid()) 
+                if (m_gdb_comm.GetProcessArchitecture().IsValid())
+                {
+                    m_target.SetArchitecture(m_gdb_comm.GetProcessArchitecture());
+                }
+                else
                 {
-                    if (m_gdb_comm.GetProcessArchitecture().IsValid())
+                    if (m_target.GetArchitecture().IsValid())
                     {
-                        m_target.SetArchitecture(m_gdb_comm.GetProcessArchitecture());
+                        m_target.GetArchitecture().MergeFrom(m_gdb_comm.GetHostArchitecture());
                     }
                     else
                     {