diff --git a/app/views/casa_org/_standard_court_orders.html.erb b/app/views/casa_org/_standard_court_orders.html.erb
index 966bb84d67..305110959f 100644
--- a/app/views/casa_org/_standard_court_orders.html.erb
+++ b/app/views/casa_org/_standard_court_orders.html.erb
@@ -25,7 +25,7 @@
             </tr>
           </thead>
           <tbody>
-            <% @standard_court_orders.each do |standard_court_order| %>
+            <% @standard_court_orders&.each do |standard_court_order| %>
               <% id = "standard_court_order-#{standard_court_order.id}" %>
               <tr>
                 <td scope="row" class="min-width">
diff --git a/app/views/shared/_court_order_list.erb b/app/views/shared/_court_order_list.erb
index a7fae60096..601c51b700 100644
--- a/app/views/shared/_court_order_list.erb
+++ b/app/views/shared/_court_order_list.erb
@@ -33,7 +33,7 @@
     <%= label_tag :selectedCourtOrder, "Court Order Type" %>
     <div class="select-position">
       <%= select_tag :selectedCourtOrder,
-          options_for_select(casa_case.casa_org.standard_court_orders.map(&:value)),
+          options_for_select(current_organization.standard_court_orders.map(&:value)),
           { include_blank: "Create custom court order", data: {court_order_form_target: "selectedCourtOrder"} }
         %>
     </div>