diff --git a/app/controllers/gradebooks_controller.rb b/app/controllers/gradebooks_controller.rb
index 77d58aed167..fce34b278e8 100644
--- a/app/controllers/gradebooks_controller.rb
+++ b/app/controllers/gradebooks_controller.rb
@@ -320,7 +320,8 @@ class GradebooksController < ApplicationController
         return
       end
 
-      if gradebook_version == "individual_enhanced"
+      individual_enhanced_enabled = @context.root_account.feature_enabled?(:individual_gradebook_enhancements)
+      if gradebook_version == "individual_enhanced" && individual_enhanced_enabled
         show_enhanced_individual_gradebook
       elsif ["srgb", "individual"].include?(gradebook_version)
         show_individual_gradebook
diff --git a/config/feature_flags/apogee_release_flags.yml b/config/feature_flags/apogee_release_flags.yml
index 7041670c625..2be246a283d 100644
--- a/config/feature_flags/apogee_release_flags.yml
+++ b/config/feature_flags/apogee_release_flags.yml
@@ -217,7 +217,7 @@ individual_gradebook_enhancements:
     to Individual Gradebook
   environments:
     ci:
-      state: on # enable for automated testings builds and local testing
+      state: allowed_on # enable for automated testings builds and local testing
     development:
       state: allowed_on # enable for local development
 hide_zero_point_quizzes_option:
diff --git a/spec/controllers/gradebooks_controller_spec.rb b/spec/controllers/gradebooks_controller_spec.rb
index 8d94b0bfadf..a6e69e3fc77 100644
--- a/spec/controllers/gradebooks_controller_spec.rb
+++ b/spec/controllers/gradebooks_controller_spec.rb
@@ -1021,6 +1021,20 @@ describe GradebooksController do
         expect(response).to render_template("gradebooks/gradebook")
       end
 
+      it "renders enhanced individual gradebook when individual_enhanced & individual_gradebook_enhancements is enabled" do
+        @course.root_account.enable_feature!(:individual_gradebook_enhancements)
+        @admin.set_preference(:gradebook_version, "individual_enhanced")
+        get "show", params: { course_id: @course.id }
+        expect(response).to render_template("layouts/application")
+      end
+
+      it "renders traditional gradebook when individual_gradebook_enhancements is disabled" do
+        @course.root_account.disable_feature!(:individual_gradebook_enhancements)
+        @admin.set_preference(:gradebook_version, "individual_enhanced")
+        get "show", params: { course_id: @course.id }
+        expect(response).to render_template("gradebooks/gradebook")
+      end
+
       describe "score to ungraded" do
         before do
           options = Gradebook::ApplyScoreToUngradedSubmissions::Options.new(