diff --git a/main/src/main/java/me/blackvein/quests/Quester.java b/main/src/main/java/me/blackvein/quests/Quester.java
index 85dc38ad7..fa9149055 100644
--- a/main/src/main/java/me/blackvein/quests/Quester.java
+++ b/main/src/main/java/me/blackvein/quests/Quester.java
@@ -3431,7 +3431,7 @@ public class Quester implements Comparable<Quester> {
                     plugin.getLogger().severe("Quest name was null or empty while loading data");
                     return null;
                 }
-                final ConfigurationSection questSec = dataSec.createSection(quest.getName());
+                final ConfigurationSection questSec = dataSec.createSection(quest.getId());
                 final QuestData questData = getQuestData(quest);
                 if (questData == null)
                     continue;
diff --git a/main/src/main/java/me/blackvein/quests/storage/implementation/file/SeparatedYamlStorage.java b/main/src/main/java/me/blackvein/quests/storage/implementation/file/SeparatedYamlStorage.java
index 879fba527..d32246d57 100644
--- a/main/src/main/java/me/blackvein/quests/storage/implementation/file/SeparatedYamlStorage.java
+++ b/main/src/main/java/me/blackvein/quests/storage/implementation/file/SeparatedYamlStorage.java
@@ -164,7 +164,7 @@ public class SeparatedYamlStorage implements StorageImplementation {
             }
             for (final String key : dataSec.getKeys(false)) {
                 final ConfigurationSection questSec = dataSec.getConfigurationSection(key);
-                final Quest quest = plugin.getQuest(key);
+                final Quest quest = plugin.getQuestById(key) != null ? plugin.getQuestById(key) : plugin.getQuest(key);
                 Stage stage;
                 if (quest == null || quester.getCurrentQuests().containsKey(quest) == false) {
                     continue;
@@ -177,8 +177,9 @@ public class SeparatedYamlStorage implements StorageImplementation {
                     continue;
                 }
                 quester.addEmptiesFor(quest, quester.getCurrentQuests().get(quest));
-                if (questSec == null)
+                if (questSec == null) {
                     continue;
+                }
                 if (questSec.contains("blocks-broken-names")) {
                     final List<String> names = questSec.getStringList("blocks-broken-names");
                     final List<Integer> amounts = questSec.getIntegerList("blocks-broken-amounts");