diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php
index 4ef5029c..8172d733 100644
--- a/site/plugins/admin/classes/EntriesManager.php
+++ b/site/plugins/admin/classes/EntriesManager.php
@@ -303,7 +303,7 @@ class EntriesManager
                         }
 
                         // Fieldset for current entry template
-                        $fieldset_path = PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . $entry['fieldset'] . '.yaml';
+                        $fieldset_path = PATH['themes'] . '/' . Registry::get('settings.theme') . '/fieldsets/' . (isset($entry['fieldset']) ? $entry['fieldset'] : 'default') . '.yaml';
                         $fieldset = YamlParser::decode(Filesystem::getFileContent($fieldset_path));
                         is_null($fieldset) and $fieldset = [];