diff --git a/system/htmly.php b/system/htmly.php
index 152097a..240f2d6 100644
--- a/system/htmly.php
+++ b/system/htmly.php
@@ -1482,6 +1482,17 @@ post('/admin/config/performance', function () {
             }
         }
         save_config($new_config, $new_Keys);
+        
+        // Clear cache after setting performance
+        $files = array();
+        $draft = array();
+        $files = glob('content/*/blog/*.md', GLOB_NOSORT);
+        $draft = glob('content/*/draft/*.md', GLOB_NOSORT);
+        rebuilt_cache('all');
+        foreach (glob('cache/page/*.cache', GLOB_NOSORT) as $file) {
+        	unlink($file);
+        }
+        
         $login = site_url() . 'admin/config/performance';
         header("location: $login");
     } else {