diff --git a/app/components/spotlight/solr_document_legacy_embed_component.html.erb b/app/components/spotlight/solr_document_legacy_embed_component.html.erb
index c428f9208..d1a05e31d 100644
--- a/app/components/spotlight/solr_document_legacy_embed_component.html.erb
+++ b/app/components/spotlight/solr_document_legacy_embed_component.html.erb
@@ -1,9 +1,5 @@
 <% if body.present? %>
   <%= body %>
-<% elsif partials? %>
-  <% partials.each do |partial| %>
-    <%= partial %>
-  <% end %>
 <% elsif embed? %>
   <%= embed %>
 <% elsif thumbnail? %>
diff --git a/app/models/spotlight/blacklight_configuration.rb b/app/models/spotlight/blacklight_configuration.rb
index e2b0badd7..f1c0a022b 100644
--- a/app/models/spotlight/blacklight_configuration.rb
+++ b/app/models/spotlight/blacklight_configuration.rb
@@ -123,7 +123,7 @@ def blacklight_config
         config.view.embed!
         # This is blacklight-gallery's openseadragon partial
         unless config.view.embed.document_component
-          config.view.embed.partials ||= ['openseadragon']
+          config.view.embed.partials ||= ['openseadragon'] unless config.view.embed.embed_component
           config.view.embed.document_component = Spotlight::SolrDocumentLegacyEmbedComponent
         end
         config.view.embed.if = false
diff --git a/app/views/spotlight/sir_trevor/blocks/_embedded_document.html.erb b/app/views/spotlight/sir_trevor/blocks/_embedded_document.html.erb
index 160b8ea15..66dc97d92 100644
--- a/app/views/spotlight/sir_trevor/blocks/_embedded_document.html.erb
+++ b/app/views/spotlight/sir_trevor/blocks/_embedded_document.html.erb
@@ -1,8 +1,4 @@
 <div class="box" data-id="<%= document.id %>">
   <% view_config = blacklight_config.view_config(:embed) %>
-  <%= render (view_config.document_component || Spotlight::SolrDocumentLegacyEmbedComponent).new((Blacklight.version > '8.0' ? :document : :presenter) => document_presenter(document, view_config: view_config), counter: nil, block: local_assigns[:block]) do |component| %>
-    <% component.with_partial do %>
-      <%= render_document_partials document, view_config.partials, component: component, document_counter: nil, view_config: view_config, block: local_assigns[:block], **(view_config.locals) %>
-    <% end if view_config&.partials&.any? %>
-  <% end %>
+  <%= render (view_config.document_component || Spotlight::SolrDocumentLegacyEmbedComponent).new(:document => document_presenter(document, view_config: view_config), counter: nil, block: local_assigns[:block]) %>
 </div>
diff --git a/spec/test_app_templates/catalog_controller.rb b/spec/test_app_templates/catalog_controller.rb
index 427401fa4..efedbcb4a 100644
--- a/spec/test_app_templates/catalog_controller.rb
+++ b/spec/test_app_templates/catalog_controller.rb
@@ -12,8 +12,14 @@ class CatalogController < ApplicationController
     # config.view.gallery.classes = 'row-cols-2 row-cols-md-3'
     config.view.masonry(document_component: Blacklight::Gallery::DocumentComponent, icon: Blacklight::Gallery::Icons::MasonryComponent)
     config.view.slideshow(document_component: Blacklight::Gallery::SlideshowComponent, icon: Blacklight::Gallery::Icons::SlideshowComponent)
+
+    config.view.embed(if: false,
+                      partials: [],
+                      document_component: Spotlight::SolrDocumentLegacyEmbedComponent,
+                      embed_component: Blacklight::Gallery::OpenseadragonEmbedComponent)
     config.show.tile_source_field = :content_metadata_image_iiif_info_ssm
-    config.show.partials.insert(1, :openseadragon)
+    config.show.embed_component = Blacklight::Gallery::OpenseadragonEmbedComponent
+
     ## Default parameters to send to solr for all search-like requests. See also SolrHelper#solr_search_params
     config.default_solr_params = {
       qt: 'search',