diff --git a/app/components/avo/fields/has_one_field/show_component.rb b/app/components/avo/fields/has_one_field/show_component.rb
index 67f8d24b1f..e7127bb5ad 100644
--- a/app/components/avo/fields/has_one_field/show_component.rb
+++ b/app/components/avo/fields/has_one_field/show_component.rb
@@ -41,6 +41,7 @@ def create_path
     args = {
       via_relation: association_id,
       via_relation_class: @resource.model_class.to_s,
+      via_resource_class: @resource.class,
       via_record_id: @resource.record.to_param,
       via_association_type: :has_one
     }
diff --git a/spec/features/avo/create_has_one_spec.rb b/spec/features/avo/create_has_one_spec.rb
index 4426bfc048..d92538b4ce 100644
--- a/spec/features/avo/create_has_one_spec.rb
+++ b/spec/features/avo/create_has_one_spec.rb
@@ -15,7 +15,7 @@
 
     click_on "Create new main post"
 
-    expect(page).to have_current_path("/admin/resources/posts/new?via_association_type=has_one&via_record_id=#{user.slug}&via_relation=user&via_relation_class=User")
+    expect(page).to have_current_path("/admin/resources/posts/new?via_association_type=has_one&via_record_id=#{user.slug}&via_relation=user&via_relation_class=User&via_resource_class=Avo%3A%3AResources%3A%3AUser")
     expect(page).to have_text user.name
 
     fill_in "post_name", with: "Main post name"