diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index 9027137bbc..6bcdb6b51c 100755
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -306,11 +306,6 @@ if ($_POST) {
 
 				//unlock($lockbckp);
 
-				if ($_POST['encrypt']) {
-					$data = encrypt_data($data, $_POST['encrypt_password']);
-					tagfile_reformat($data, $data, "config.xml");
-				}
-
 				/*
 				 *  Backup RRD Data
 				 */
@@ -320,6 +315,11 @@ if ($_POST) {
 					$data = str_replace($closing_tag, $rrd_data_xml . $closing_tag, $data);
 				}
 
+				if ($_POST['encrypt']) {
+					$data = encrypt_data($data, $_POST['encrypt_password']);
+					tagfile_reformat($data, $data, "config.xml");
+				}
+
 				$size = strlen($data);
 				header("Content-Type: application/octet-stream");
 				header("Content-Disposition: attachment; filename={$name}");