diff --git a/dev/com.ibm.ws.kernel.boot.ws-server/publish/bin/server b/dev/com.ibm.ws.kernel.boot.ws-server/publish/bin/server
index 2d49f6cca985..3887327ea5be 100755
--- a/dev/com.ibm.ws.kernel.boot.ws-server/publish/bin/server
+++ b/dev/com.ibm.ws.kernel.boot.ws-server/publish/bin/server
@@ -460,6 +460,8 @@ serverEnvDefaults()
     fi
   esac
 
+  SERVER_IBM_JAVA_OPTIONS="${SERVER_IBM_JAVA_OPTIONS} -Djdk.nativePBKDF2=true"
+
   # Add -Xquickstart -Xshareclasses:none for client JVMs only.  We don't want 
   # shared classes cache created for client operations.
   # Add -Dcom.ibm.tools.attach.enable=yes to allow self-attach
diff --git a/dev/com.ibm.ws.kernel.boot.ws-server/publish/bin/server.bat b/dev/com.ibm.ws.kernel.boot.ws-server/publish/bin/server.bat
index 389e57a798d6..42be7083b2a7 100644
--- a/dev/com.ibm.ws.kernel.boot.ws-server/publish/bin/server.bat
+++ b/dev/com.ibm.ws.kernel.boot.ws-server/publish/bin/server.bat
@@ -597,6 +597,8 @@ goto:eof
     set SERVER_IBM_JAVA_OPTIONS=!SPECIFIED_JAVA_OPTIONS!
   )
 
+  set SERVER_IBM_JAVA_OPTIONS=!SERVER_IBM_JAVA_OPTIONS! -Djdk.nativePBKDF2=true
+
   @REM Add -Xquickstart -Xshareclasses:none for client JVMs only.  We don't want 
   @REM shared classes cache created for client operations.
   set IBM_JAVA_OPTIONS=-Xquickstart !IBM_JAVA_OPTIONS! -Xshareclasses:none