diff --git a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
index 2544b46b..5b6855e6 100644
--- a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
@@ -61,14 +61,18 @@ public abstract class BaseActivity extends AppCompatActivity {
         }
 
         // enabling counter badges by default
-        if(tinyDb.getString("enableCounterBadgesInit").isEmpty()) {
+        if(!tinyDb.getBoolean("enableCounterBadgesInit")) {
             tinyDb.putBoolean("enableCounterBadges", true);
-            tinyDb.putString("enableCounterBadgesInit", "yes");
+            tinyDb.putBoolean("enableCounterBadgesInit", true);
         }
 
         // setting default font
-        tinyDb.putString("customFontStr", "Manrope");
-        tinyDb.putInt("customFontId", 1);
+		if(!tinyDb.getBoolean("customFontStrInit")) {
+			tinyDb.putString("customFontStr", "Manrope");
+			tinyDb.putInt("customFontId", 1);
+
+			tinyDb.putBoolean("customFontStrInit", true);
+		}
 
     }