diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp
index c4f9f4d3..07d2d40c 100644
--- a/packages/grpc-native-core/binding.gyp
+++ b/packages/grpc-native-core/binding.gyp
@@ -93,6 +93,9 @@
       'GRPC_UV',
       'GRPC_NODE_VERSION="1.20.2"'
     ],
+    'defines!': [
+      'OPENSSL_THREADS'
+    ],
     'conditions': [
       ['grpc_gcov=="true"', {
         'cflags': [
diff --git a/packages/grpc-native-core/templates/binding.gyp.template b/packages/grpc-native-core/templates/binding.gyp.template
index 9ec471a6..bc904142 100644
--- a/packages/grpc-native-core/templates/binding.gyp.template
+++ b/packages/grpc-native-core/templates/binding.gyp.template
@@ -85,6 +85,9 @@
         'GRPC_UV',
         'GRPC_NODE_VERSION="${settings.get('node_version', settings.version)}"'
       ],
+      'defines!': [
+        'OPENSSL_THREADS'
+      ],
       'conditions': [
         ['grpc_gcov=="true"', {
           % for arg, prop in [('CPPFLAGS', 'cflags'), ('DEFINES', 'defines'), ('LDFLAGS', 'ldflags')]:
diff --git a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_electron.bat b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_electron.bat
index 1575b7ce..95ca024d 100644
--- a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_electron.bat
+++ b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_electron.bat
@@ -14,7 +14,7 @@
 
 set arch_list=ia32 x64
 
-set electron_versions=1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 1.7.0 1.8.0 2.0.0 3.0.0 3.1.0 4.1.0
+set electron_versions=1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 1.7.0 1.8.0 2.0.0 3.0.0 3.1.0 4.1.0 5.0.0
 
 set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm
 
diff --git a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_electron.sh b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_electron.sh
index 7d128127..6eb65014 100755
--- a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_electron.sh
+++ b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_electron.sh
@@ -16,7 +16,7 @@
 set -ex
 
 arch_list=( ia32 x64 )
-electron_versions=( 1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 1.7.0 1.8.0 2.0.0 3.0.0 3.1.0 4.1.0 )
+electron_versions=( 1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 1.7.0 1.8.0 2.0.0 3.0.0 3.1.0 4.1.0 5.0.0 )
 
 umask 022