diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index 845b6c07e3e4..a3113063d46d 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -425,11 +425,12 @@ imply_option('--enable-fmp4', ffmpeg, '--enable-ffmpeg')
 option('--enable-av1',
         help='Enable libaom for av1 video support')
 
-@depends('--enable-av1', target)
-def av1(value, target):
+@depends('--enable-av1', target, c_compiler)
+def av1(value, target, c_compiler):
     enabled = bool(value)
     if value.origin == 'default':
-        if target.os == 'WINNT' and target.cpu == 'x86':
+        if target.os == 'WINNT' and target.cpu == 'x86' and \
+                c_compiler and c_compiler.type == 'msvc':
             enabled = False
         else:
             enabled = True