diff --git a/app/views/oqs/edit/index.html.erb b/app/views/oqs/edit/index.html.erb
index 70e9a0ff..27595303 100644
--- a/app/views/oqs/edit/index.html.erb
+++ b/app/views/oqs/edit/index.html.erb
@@ -112,7 +112,10 @@ $(document).ready(function(){
     var remarks = $("textarea[name='remarks']").val();
     var order_items_id = $(this).attr('data-id');
     var params = { 'order_items_id': order_items_id, 'qty_weight': qty_weight, 'remarks': remarks }
-    var booking_id = '<%= @booking.booking_id %>';
+    var booking_id = '';
+    <% if !@booking.nil? %>
+      booking_id = '<%= @booking.booking_id %>';
+    <% end %>
     
     $.ajax({
       type: 'POST',
@@ -144,7 +147,10 @@ $(document).ready(function(){
   });
 
    $('#back').on('click', function () {
-      var booking_id = '<%= @booking.booking_id %>';
+      var booking_id = '';
+      <% if !@booking.nil? %>
+        booking_id = '<%= @booking.booking_id %>';
+      <% end %>
       <% if !@link_type.nil? %>
         <% if @link_type == 'oqs' %>
           window.location.href = '/oqs';