diff --git a/lib/vehicles/hooks/issues_form_hook_listener.rb b/lib/vehicles/hooks/issues_form_hook_listener.rb
index faf832e..62b2241 100644
--- a/lib/vehicles/hooks/issues_form_hook_listener.rb
+++ b/lib/vehicles/hooks/issues_form_hook_listener.rb
@@ -23,7 +23,7 @@ module Vehicles
           locals: {
             vehicle: context[:form].select( :vehicle_id, 
               context[:issue].customer ? context[:issue].customer.vehicles.pluck(:name, :id) : [], 
-              selected: context[:issue].vehicle, 
+              selected: context[:issue].vehicle ? context[:issue].vehicle.id : nil, 
               include_blank: true )
           } 
         })