diff --git a/app/jobs/connect_app_job.rb b/app/jobs/connect_app_job.rb
index 9645ebd7d5..fa1b802d05 100644
--- a/app/jobs/connect_app_job.rb
+++ b/app/jobs/connect_app_job.rb
@@ -20,7 +20,7 @@ class ConnectAppJob < ApplicationJob
     selector = "#connected-app-discover-regen.enterprise_#{enterprise.id}"
     html = ApplicationController.render(
       partial: "admin/enterprises/form/connected_apps/discover_regen",
-      locals: { enterprise:, connected_app: enterprise.connected_apps.first},
+      locals: { enterprise:, connected_app: enterprise.connected_apps.discover_regen.first },
     )
 
     cable_ready[channel].morph(selector:, html:).broadcast
diff --git a/app/models/connected_app.rb b/app/models/connected_app.rb
index 71d5908740..d2e6ffa8b7 100644
--- a/app/models/connected_app.rb
+++ b/app/models/connected_app.rb
@@ -6,6 +6,8 @@
 class ConnectedApp < ApplicationRecord
   belongs_to :enterprise
 
+  scope :discover_regen, -> { where(type: "ConnectedApp") }
+
   def connecting?
     data.nil?
   end
diff --git a/app/views/admin/enterprises/form/_connected_apps.html.haml b/app/views/admin/enterprises/form/_connected_apps.html.haml
index 5aac9c29c4..27e3d5a567 100644
--- a/app/views/admin/enterprises/form/_connected_apps.html.haml
+++ b/app/views/admin/enterprises/form/_connected_apps.html.haml
@@ -1,2 +1,2 @@
 = render partial: "/admin/enterprises/form/connected_apps/discover_regen",
-         locals: { enterprise:, connected_app: enterprise.connected_apps.first }
+         locals: { enterprise:, connected_app: enterprise.connected_apps.discover_regen.first }