diff --git a/worker/deps/openssl/openssl.gyp b/worker/deps/openssl/openssl.gyp
index 0c9fb9eefe..af4440f0b9 100644
--- a/worker/deps/openssl/openssl.gyp
+++ b/worker/deps/openssl/openssl.gyp
@@ -16,7 +16,8 @@
         'OPENSSL_NO_HW',
       ],
       'conditions': [
-        [ 'openssl_no_asm==1', {
+        # Skip ASM on Windows due to linking challenges (see https://github.com/versatica/mediasoup/issues/604)
+        [ 'openssl_no_asm==1 or OS=="win"', {
           'includes': ['./openssl_no_asm.gypi'],
         }, 'target_arch=="arm64" and OS=="win"', {
           # VC-WIN64-ARM inherits from VC-noCE-common that has no asms.
diff --git a/worker/scripts/configure.py b/worker/scripts/configure.py
index 47fbd3cac7..0246cc1f20 100755
--- a/worker/scripts/configure.py
+++ b/worker/scripts/configure.py
@@ -27,6 +27,7 @@ def host_arch():
     machine = platform.machine()
     if machine == 'i386': return 'ia32'
     if machine == 'x86_64': return 'x64'
+    if machine == 'AMD64': return 'x64'
     if machine == 'aarch64': return 'arm64'
     if machine == 'arm64': return 'arm64'
     if machine == 'mips64': return 'mips64el'