diff --git a/CHANGELOG.md b/CHANGELOG.md
index da80b602..30644816 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improved logging in preview and when errors occur via WebSocket commands (#467)
 - Fixed pull event handler handling of extremely long class names from diff (#467)
 - Fixed Git web UI prompt to update file list when file selected/unselected (#478)
+- Fixed folder settings in mappings to be saved and persist (#483)
 
 ## [2.4.1] - 2024-08-02
 
diff --git a/csp/gitprojectsettings.csp b/csp/gitprojectsettings.csp
index 3043afd4..c116f6e7 100644
--- a/csp/gitprojectsettings.csp
+++ b/csp/gitprojectsettings.csp
@@ -665,6 +665,13 @@ function toggleNoFolders(e){
 
 $('[id^=noFoldersSwitch]').click(toggleNoFolders);
 
+// Check to persist state of no folder switches  
+$('.mapping-input-group').children('.voca').each(function(){
+    var currElement = $(this).children().children(".custom-control").children()[0]
+    if(!$(currElement).hasClass("active")) {
+        $(currElement).parent().siblings("#NoFolders")[0].value = "NoFolders";
+    }
+});
 </script>
 </body>
 </html>
diff --git a/module.xml b/module.xml
index 0ddd02b1..fd8f8b2b 100644
--- a/module.xml
+++ b/module.xml
@@ -3,7 +3,7 @@
   <Document name="git-source-control.ZPM">
     <Module>
       <Name>git-source-control</Name>
-      <Version>2.4.1</Version>
+      <Version>2.5.0</Version>
       <Description>Server-side source control extension for use of Git on InterSystems platforms</Description>
       <Keywords>git source control studio vscode</Keywords>
       <Packaging>module</Packaging>