diff --git a/.travis.yml b/.travis.yml
index c7804b1eaa..f47f5fc6ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,7 @@ branches:
   only:
     - master
     - /release\/.*/
+    - fix/MNT-21879
 
 env:
   global:
diff --git a/pom.xml b/pom.xml
index 6e05a8972b..bc23ad47bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
         <dependency.webscripts.version>8.10</dependency.webscripts.version>
         <dependency.bouncycastle.version>1.66</dependency.bouncycastle.version>
         <dependency.mockito-core.version>3.5.11</dependency.mockito-core.version>
-        <dependency.org-json.version>20090211</dependency.org-json.version>
+        <dependency.org-json.version>20200518</dependency.org-json.version>
         <dependency.commons-dbcp.version>1.4-DBCP330</dependency.commons-dbcp.version>
         <dependency.guava.version>28.2-jre</dependency.guava.version>
         <dependency.commons-io.version>2.8.0</dependency.commons-io.version>
diff --git a/repository/src/main/java/org/alfresco/repo/preference/PreferenceServiceImpl.java b/repository/src/main/java/org/alfresco/repo/preference/PreferenceServiceImpl.java
index f19514a580..2bea1a681e 100644
--- a/repository/src/main/java/org/alfresco/repo/preference/PreferenceServiceImpl.java
+++ b/repository/src/main/java/org/alfresco/repo/preference/PreferenceServiceImpl.java
@@ -196,7 +196,7 @@ public class PreferenceServiceImpl implements PreferenceService, Extensible
             {
                 if(jsonPrefs.has(preferenceName))
                 {
-                    preferenceValue = jsonPrefs.getString(preferenceName);
+                    preferenceValue = String.valueOf(jsonPrefs.get(preferenceName));
                 }
             }
         }