diff --git a/Ghidra/Features/Base/.launch/Ghidra.launch b/Ghidra/Features/Base/.launch/Ghidra.launch
index 643b32cce5..400ccc7f4d 100644
--- a/Ghidra/Features/Base/.launch/Ghidra.launch
+++ b/Ghidra/Features/Base/.launch/Ghidra.launch
@@ -26,7 +26,8 @@
+
-
+
diff --git a/Ghidra/RuntimeScripts/Common/support/launch.properties b/Ghidra/RuntimeScripts/Common/support/launch.properties
index 5212b28141..972fc62eb4 100644
--- a/Ghidra/RuntimeScripts/Common/support/launch.properties
+++ b/Ghidra/RuntimeScripts/Common/support/launch.properties
@@ -4,8 +4,9 @@
# NOTE: Ghidra requires a JDK to launch.
JAVA_HOME_OVERRIDE=
-# Required Ghidra class loader
+# Required Ghidra class loader (forces class data sharing to be disabled...hide warning)
VMARGS=-Djava.system.class.loader=ghidra.GhidraClassLoader
+VMARGS=-Xshare:off
# Set default encoding to UTF8
VMARGS=-Dfile.encoding=UTF8