diff --git a/libraries/classes/Config/Settings.php b/libraries/classes/Config/Settings.php
index dbb640624a..86801d0029 100644
--- a/libraries/classes/Config/Settings.php
+++ b/libraries/classes/Config/Settings.php
@@ -2610,7 +2610,7 @@ final class Settings
         $settings = get_object_vars($this);
         $settings['Console'] = $this->Console->asArray();
         $settings['DBG'] = $this->DBG->asArray();
-        $settings['SQLQuery'] = get_object_vars($this->SQLQuery);
+        $settings['SQLQuery'] = $this->SQLQuery->asArray();
         $settings['Export'] = $this->Export->asArray();
         $settings['Import'] = $this->Import->asArray();
         $settings['Schema'] = $this->Schema->asArray();
diff --git a/libraries/classes/Config/Settings/SqlQueryBox.php b/libraries/classes/Config/Settings/SqlQueryBox.php
index 64bbe244ea..ac2f3e1505 100644
--- a/libraries/classes/Config/Settings/SqlQueryBox.php
+++ b/libraries/classes/Config/Settings/SqlQueryBox.php
@@ -68,6 +68,17 @@ final class SqlQueryBox
         $this->Refresh = $this->setRefresh($sqlQueryBox);
     }
 
+    /** @return array<string, bool> */
+    public function asArray(): array
+    {
+        return [
+            'Edit' => $this->Edit,
+            'Explain' => $this->Explain,
+            'ShowAsPHP' => $this->ShowAsPHP,
+            'Refresh' => $this->Refresh,
+        ];
+    }
+
     /** @param mixed[] $sqlQueryBox */
     private function setEdit(array $sqlQueryBox): bool
     {
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index afe9ae0140..1d717ca6ec 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -861,14 +861,6 @@
       <code>$maxRowPlotLimit</code>
     </PossiblyUnusedProperty>
   </file>
-  <file src="libraries/classes/Config/Settings/SqlQueryBox.php">
-    <PossiblyUnusedProperty>
-      <code>$Edit</code>
-      <code>$Explain</code>
-      <code>$Refresh</code>
-      <code>$ShowAsPHP</code>
-    </PossiblyUnusedProperty>
-  </file>
   <file src="libraries/classes/Config/Settings/Transformations.php">
     <PossiblyUnusedProperty>
       <code>$Bool2Text</code>
diff --git a/test/classes/Config/Settings/SqlQueryBoxTest.php b/test/classes/Config/Settings/SqlQueryBoxTest.php
index beb63222c8..e18d332c91 100644
--- a/test/classes/Config/Settings/SqlQueryBoxTest.php
+++ b/test/classes/Config/Settings/SqlQueryBoxTest.php
@@ -34,9 +34,12 @@ class SqlQueryBoxTest extends TestCase
 
         $expected = array_merge($this->defaultValues, $expectedValues);
         $settings = new SqlQueryBox($actualValues);
+        $sqlQueryBoxArray = $settings->asArray();
 
         foreach (array_keys($expectedValues) as $key) {
             $this->assertSame($expected[$key], $settings->$key);
+            $this->assertArrayHasKey($key, $sqlQueryBoxArray);
+            $this->assertSame($expected[$key], $sqlQueryBoxArray[$key]);
         }
     }