diff --git a/ChangeLog.md b/ChangeLog.md
index dc621b4..36ffbd1 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -15,8 +15,9 @@
 
 ### General Changes
 
-* Full package
+* NanoDroid-Font (nanodroid-font)
   * add `Splatoon` and `SuperMarioOdyssey` fonts
+  * in Sytem Mode only backup original font, if the custom font provided actually exists
 * README
   * add weblinks in the Credits section
 
diff --git a/Full/system/xbin/nanodroid-font b/Full/system/xbin/nanodroid-font
index 2d7d193..7c3d46b 100755
--- a/Full/system/xbin/nanodroid-font
+++ b/Full/system/xbin/nanodroid-font
@@ -79,9 +79,9 @@ set_font () {
 			error "Font ${1} does not exist"
 		fi
 	else
-		backup_font
-
 		if [ -f /system/fonts/NanoDroid/${1}.ttf ]; then
+			backup_font
+
 			for font in ${FONTFILES}; do
 				ln -sf /system/fonts/NanoDroid/${1}.ttf \
 					/system/fonts/${font} || \