diff --git a/app/src/processing/mode/java/JavaBuild.java b/app/src/processing/mode/java/JavaBuild.java
index 5bb3bcf4f..338c391bc 100644
--- a/app/src/processing/mode/java/JavaBuild.java
+++ b/app/src/processing/mode/java/JavaBuild.java
@@ -1279,7 +1279,7 @@ public class JavaBuild {
         PrintWriter writer = PApplet.createWriter(batFile);
         writer.println("@echo off");
         String javaPath = embedJava ? ".\\java\\bin\\java.exe" : "java";
-        writer.println(javaPath + " -Djava.ext.dirs=lib -Djava.library.path=lib " + sketch.getName());
+        writer.println(javaPath + " -Djna.nosys=true -Djava.ext.dirs=lib -Djava.library.path=lib " + sketch.getName());
         writer.flush();
         writer.close();
       } else {
diff --git a/build/windows/export/launcher.cpp b/build/windows/export/launcher.cpp
index eb09b8334..06605c500 100644
--- a/build/windows/export/launcher.cpp
+++ b/build/windows/export/launcher.cpp
@@ -187,6 +187,10 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow)
   strcat(outgoing_cmd_line, exe_directory);
   strcat(outgoing_cmd_line, "\\lib\" ");
 
+  // Ignore JNA from the system path
+  // https://github.com/processing/processing/issues/2239
+  strcat(outgoing_cmd_line, "-Djna.nosys=true ");
+
   // add the name of the class to execute and a space before the next arg
   strcat(outgoing_cmd_line, java_main_class);
   strcat(outgoing_cmd_line, " ");
diff --git a/todo.txt b/todo.txt
index 5a619ef9f..dbedcf43a 100644
--- a/todo.txt
+++ b/todo.txt
@@ -28,8 +28,8 @@ _   https://github.com/processing/processing/issues/2095
 _ JNA conflicts can be avoided with a -D option
 _   https://github.com/processing/processing/issues/2239
 X   fix for Windows launchers
-_   fix for Windows export
-_   fix for Windows export 64-bit
+X   fix for Windows export
+X   fix for Windows export 64-bit
 _   fix for Linux launcher
 _   fix for Linux export
 _   fix for OS X launcher