diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 3de713c7..da50ac34 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -68,11 +68,14 @@ $(document).on('turbolinks:load', function() {
 	            var show_date = date.getDate() + "-" + (date.getMonth()+1) + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();
 	            var set_menu_items = data[field]["set_menu_items"];
 	            var set_instance_items = "";
-	            if(set_menu_items.length > 0){
-					$.each(set_menu_items, function(k,val){
-						set_instance_items += '<br><span class="font-12">'+val+'</span>';
-					});
-				}
+	            if(set_menu_items!=null){
+	            	if(set_menu_items.length > 0){
+						$.each(set_menu_items, function(k,val){
+							set_instance_items += '<br><span class="font-12">'+val+'</span>';
+						});
+					}
+	            }
+	            	
 	            row ='<div class="card queue_station animated " data-order-no="'+data[field]["order_id"]+'">'
 	                    +'<div class="card-block">'
 	                         +'<div class="row">'
@@ -146,10 +149,12 @@ $(document).on('turbolinks:load', function() {
         			var parse_data = JSON.parse(data); 
         			var set_menu_items = parse_data.set_menu_items;
         			var set_instance_items = "";
-        			if(set_menu_items.length > 0){
-        				$.each(set_menu_items, function(k,val){
-							set_instance_items += '<br><span class="font-12">'+val+'</span>';
-						});
+        			if(set_menu_items!=null){
+        				if(set_menu_items.length > 0){
+	        				$.each(set_menu_items, function(k,val){
+								set_instance_items += '<br><span class="font-12">'+val+'</span>';
+							});
+	        			}
         			}
 	    			var order_item_row = "<tr>" +
 							                "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +