diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp
index c776d5394220d..9d1c333b2e482 100644
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -4768,8 +4768,8 @@ bool TargetProperties::GetSwiftUseContextFreePrintObject() const {
   if (exp_values)
     return exp_values
         ->GetPropertyAtIndexAs<bool>(ePropertySwiftUseContextFreePrintObject)
-        .value_or(false);
-  return false;
+        .value_or(true);
+  return true;
 }
 
 void TargetProperties::SetUseDIL(ExecutionContext *exe_ctx, bool b) {
diff --git a/lldb/source/Target/TargetProperties.td b/lldb/source/Target/TargetProperties.td
index 7d7263ece5c48..6ad880254a138 100644
--- a/lldb/source/Target/TargetProperties.td
+++ b/lldb/source/Target/TargetProperties.td
@@ -38,7 +38,7 @@ let Definition = "target_experimental" in {
     DefaultTrue,
     Desc<"Enables caching of task pointers inside the swift tasks plugin">;
   def SwiftUseContextFreePrintObject: Property<"swift-use-context-free-po", "Boolean">,
-    DefaultFalse,
+    DefaultTrue,
     Desc<"If true, use the context-free po implementation for Swift.">;
   def UseDIL : Property<"use-DIL", "Boolean">,
     Global, DefaultTrue,
diff --git a/lldb/test/API/lang/swift/expression/error_reporting/TestSwiftExpressionErrorReporting.py b/lldb/test/API/lang/swift/expression/error_reporting/TestSwiftExpressionErrorReporting.py
index e665b77e9635e..8699ed2fb6df5 100644
--- a/lldb/test/API/lang/swift/expression/error_reporting/TestSwiftExpressionErrorReporting.py
+++ b/lldb/test/API/lang/swift/expression/error_reporting/TestSwiftExpressionErrorReporting.py
@@ -68,8 +68,6 @@ def test_missing_type(self):
         target, process, thread, bkpt = lldbutil.run_to_source_breakpoint(
             self, 'break here', lldb.SBFileSpec('main.swift'))
 
-        self.runCmd("settings set target.experimental.swift-use-context-free-po true")
-
         options = lldb.SBExpressionOptions()
         value = self.frame().EvaluateExpression("strct", options)
         def check(value):
diff --git a/lldb/test/API/lang/swift/po/pointer_and_mangled_typename/TestSwiftPrintObjectPointerAndTypeName.py b/lldb/test/API/lang/swift/po/pointer_and_mangled_typename/TestSwiftPrintObjectPointerAndTypeName.py
index a3129e9779a53..643103d265e58 100644
--- a/lldb/test/API/lang/swift/po/pointer_and_mangled_typename/TestSwiftPrintObjectPointerAndTypeName.py
+++ b/lldb/test/API/lang/swift/po/pointer_and_mangled_typename/TestSwiftPrintObjectPointerAndTypeName.py
@@ -8,7 +8,6 @@ class TestCase(TestBase):
 
     def setUp(self):
         TestBase.setUp(self)
-        self.runCmd("settings set target.experimental.swift-use-context-free-po true")
 
         self.log = self.getBuildArtifact("expr.log")
         self.runCmd(f"log enable lldb expr -f {self.log}")