diff --git a/app/controllers/api/restaurant/menu_controller.rb b/app/controllers/api/restaurant/menu_controller.rb
index 47a3703c..7dfa0ec5 100755
--- a/app/controllers/api/restaurant/menu_controller.rb
+++ b/app/controllers/api/restaurant/menu_controller.rb
@@ -6,7 +6,7 @@ class Api::Restaurant::MenuController < Api::ApiController
     param_checksum = params[:checksum]
     # checksum = File.readlines("public/checksums/menu_json.txt").pop.chomp
 
-    all_menu = Menu.all
+    all_menu = Menu.active.all
     @request_url = ''
     if ENV["SERVER_MODE"] == "cloud"
       @request_url = request.base_url
diff --git a/app/controllers/origami/dashboard_controller.rb b/app/controllers/origami/dashboard_controller.rb
index 08557cd6..25ea8390 100644
--- a/app/controllers/origami/dashboard_controller.rb
+++ b/app/controllers/origami/dashboard_controller.rb
@@ -104,7 +104,7 @@ class Origami::DashboardController < BaseOrigamiController
   end
 
 def get_all_menu
-    @menus = Menu.all   
+    @menus = Menu.active.all   
 end
 
 def get_credit_sales
diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb
index 03e2c56f..cccc6dc7 100755
--- a/app/controllers/settings/menus_controller.rb
+++ b/app/controllers/settings/menus_controller.rb
@@ -5,7 +5,7 @@ class Settings::MenusController < ApplicationController
   # GET /settings/menus
   # GET /settings/menus.json
   def index
-    @settings_menus = Menu.unscoped.all.page(params[:page]).per(10)
+    @settings_menus = Menu.all.page(params[:page]).per(10)
     respond_to do |format|
       format.html
       format.xlsx
diff --git a/app/models/menu.rb b/app/models/menu.rb
index 58d540fd..a825cc7b 100755
--- a/app/models/menu.rb
+++ b/app/models/menu.rb
@@ -6,7 +6,8 @@ class Menu < ApplicationRecord
   validates_presence_of :name, :valid_days, :valid_time_from, :valid_time_to
   # validates_format_of :valid_days, :with => /\A([0-7]{1}(,[0-7]{1})*)?\Z/i
   #Default Scope to pull the active version only
-  default_scope { where(is_active: true).order("created_at asc") }
+  default_scope { order("created_at asc") }
+  scope :active, -> {where("is_active = true")}
 
   def self.current_menu
     today = DateTime.now