diff --git a/Core/src/main/java/com/songoda/core/configuration/Config.java b/Core/src/main/java/com/songoda/core/configuration/Config.java
index 0cee70c2..0a1d0bd6 100644
--- a/Core/src/main/java/com/songoda/core/configuration/Config.java
+++ b/Core/src/main/java/com/songoda/core/configuration/Config.java
@@ -613,6 +613,7 @@ public class Config extends ConfigSection {
             }
             yamlOptions.setIndent(indentation);
             yamlOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+            yamlOptions.setSplitLines(false);
             yamlRepresenter.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
             StringWriter str = new StringWriter();
             if (headerComment != null) {
diff --git a/Core/src/main/java/com/songoda/core/locale/Locale.java b/Core/src/main/java/com/songoda/core/locale/Locale.java
index 310dcfc3..6b9c7345 100644
--- a/Core/src/main/java/com/songoda/core/locale/Locale.java
+++ b/Core/src/main/java/com/songoda/core/locale/Locale.java
@@ -236,9 +236,9 @@ public class Locale {
                                 added.stream().collect(Collectors.joining("\n"))
                         );
                     }
-                    existingLang.setRootNodeSpacing(0);
-                    existingLang.save();
                 }
+                existingLang.setRootNodeSpacing(0);
+                existingLang.save();
                 return !added.isEmpty();
             } catch (InvalidConfigurationException ex) {
                 plugin.getLogger().log(Level.SEVERE, "Error checking config " + existingFile.getName(), ex);