diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
index 06ae06b21..e8290b174 100644
--- a/ext/CMakeLists.txt
+++ b/ext/CMakeLists.txt
@@ -226,6 +226,9 @@ set(TINYFORMAT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/tinyformat PARENT_SCOPE)
 if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|AMD64")
   # Build asmjit
   set(ASMJIT_BUILD_X64 TRUE)
+  if (MSVC)
+    set(ASMJIT_STATIC ON CACHE BOOL " " FORCE)
+  endif()
   if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override -Wno-undefined-inline")
   endif()
diff --git a/include/mitsuba/core/jit.h b/include/mitsuba/core/jit.h
index ffc220148..f1d3fef8e 100644
--- a/include/mitsuba/core/jit.h
+++ b/include/mitsuba/core/jit.h
@@ -11,6 +11,9 @@
 #    pragma warning(push)
 #    pragma warning(disable : 4804) // warning C4804: '~': unsafe use of type 'bool' in operation
 #    pragma warning(disable : 4245) // warning C4245: 'argument': conversion from 'int' to 'uint32_t', signed/unsigned mismatch
+#    if !defined(ASMJIT_STATIC)     // Fix asmjit dll conflicts when loading mitsuba in python
+#      define ASMJIT_STATIC
+#    endif
 #  endif
 
 #  include <asmjit/asmjit.h>