diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a1b32f8a9..27e997799b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,8 @@ and this project adheres to
 
 - Tooltip for credential select in Job Edit form is cut off
   [#972](https://github.com/OpenFn/Lightning/issues/972)
+- Dataclip type and state assembly notice for creating new dataclip dropped
+  during refactor [#975](https://github.com/OpenFn/Lightning/issues/975)
 
 ## [v0.7.2] - 2023-08-10
 
@@ -30,9 +32,6 @@ and this project adheres to
 
 ### Fixed
 
-- Dataclip type and state assembly notice for creating new dataclip dropped
-  during refactor [#975](https://github.com/OpenFn/Lightning/issues/975)
-
 ## [v0.7.1] - 2023-08-04
 
 ### Added
diff --git a/lib/lightning_web/live/components/common.ex b/lib/lightning_web/live/components/common.ex
index 80b2b52a25..d05b487820 100644
--- a/lib/lightning_web/live/components/common.ex
+++ b/lib/lightning_web/live/components/common.ex
@@ -286,6 +286,10 @@ defmodule LightningWeb.Components.Common do
     )
   end
 
+  attr :type, :atom,
+    required: true,
+    values: [:run_result, :http_request, :global, :saved_input]
+
   def dataclip_type_pill(assigns) do
     base_classes = ~w[
       px-2 py-1 rounded-full inline-block text-sm font-mono
@@ -293,7 +297,7 @@ defmodule LightningWeb.Components.Common do
 
     class =
       base_classes ++
-        case assigns[:dataclip].type do
+        case assigns[:type] do
           :run_result -> ~w[bg-purple-500 text-purple-900]
           :http_request -> ~w[bg-green-500 text-green-900]
           :global -> ~w[bg-blue-500 text-blue-900]
@@ -305,7 +309,7 @@ defmodule LightningWeb.Components.Common do
 
     ~H"""
     <div class={@class}>
-      <%= @dataclip.type %>
+      <%= @type %>
     </div>
     """
   end
diff --git a/lib/lightning_web/live/dataclip_live/index.html.heex b/lib/lightning_web/live/dataclip_live/index.html.heex
index 3693bfd014..3e47133022 100644
--- a/lib/lightning_web/live/dataclip_live/index.html.heex
+++ b/lib/lightning_web/live/dataclip_live/index.html.heex
@@ -28,7 +28,7 @@
           <.td>
             <%= dataclip.inserted_at |> Calendar.strftime("%c %Z") %>
           </.td>
-          <.td><Common.dataclip_type_pill dataclip={dataclip} /></.td>
+          <.td><Common.dataclip_type_pill type={dataclip.type} /></.td>
           <.td>
             <code>
               <%= dataclip.body
diff --git a/lib/lightning_web/live/job_live/manual_run_component.ex b/lib/lightning_web/live/job_live/manual_run_component.ex
index bf80dbe5b3..a644143af2 100644
--- a/lib/lightning_web/live/job_live/manual_run_component.ex
+++ b/lib/lightning_web/live/job_live/manual_run_component.ex
@@ -67,8 +67,8 @@ defmodule LightningWeb.JobLive.ManualRunComponent do
                 Dataclip Type
               </div>
               <div class="basis-1/2 text-right">
-                <Common.dataclip_type_pill dataclip={
-                  @selected_dataclip || %{id: "", body: [], type: :saved_input}
+                <Common.dataclip_type_pill type={
+                  (@selected_dataclip && @selected_dataclip.type) || :saved_input
                 } />
               </div>
             </div>