diff --git a/src/Services/FieldSetFieldFinder.php b/src/Services/FieldSetFieldFinder.php
index <HASH>..<HASH> 100644
--- a/src/Services/FieldSetFieldFinder.php
+++ b/src/Services/FieldSetFieldFinder.php
@@ -237,8 +237,12 @@ class FieldSetFieldFinder
         }
         elseif( $field instanceof HasOne )
         {
-            /** @var HasOne $field */
-            return $field->getRelationFieldSet( $field->getValue() ?: $field->getRelatedModel() );
+            if( $field->getValue() )
+            {
+                return $field->getRelationFieldSet( $field->getValue() );
+            }
+
+            return new FieldSet( $field->getRelatedModel(), $field->getNameSpacedName() );
         }
         elseif( $field instanceof Translatable )
         {
Fix issue with arbory image field validation in new nodes