diff --git a/configuration.md b/configuration.md
index 895977a..36dba0b 100644
--- a/configuration.md
+++ b/configuration.md
@@ -81,7 +81,7 @@ Pairing ESPHome with Home Assistant opens a multitude of opportunities to create
 
 ## Disable Display and LED based on time
 
-Enabling the "Blank Page" switch will disable output on the display.  It is not necessary to turn off any existing pages, and disabling all pages will result in the device rebooting
+Enabling the "Blank Page" switch will disable output on the display.  It is not necessary to turn off any existing pages.
 
 1. In Home Assistant, navigate to Settings>Automations and scenes
 2. Click "Create Automation" button, then "Create new automation"
@@ -90,9 +90,8 @@ Enabling the "Blank Page" switch will disable output on the display.  It is not
       2. Set to your desired time to turn off the display and/or LED
    2. Then do
       1. Add Action>Device>Select your AirGradient from the ESPHome Integration
-      2. In the Action field, select "Turn on `<Your AirGradient Name> Display Blank Page`"
-         1. For the base config with only the single page display package, this will set the display to show an empty page
-         2. If using the multi_page package, may need to add additional actions to turn off the other enabled pages
+      2. In the Action field, select "Turn on `<Your AirGradient Name> Display Blank Page`" (if your display package provides this switch)
+         1. This will set the display to show an empty page
       3. Repeat action for "Turn Off `<Your AirGradient Name> LED Strip`" (If applicable)
    3. Click the Save button and give it a name, such as "AirGradient Night Mode"
 3. Repeat with a new Automation, with the actions reversed (Turn off Display Blank Page and turn on LED Strip), at the desired time with a name such as "AirGradient Night Mode Off"
diff --git a/packages/display_sh1106_multi_page.yaml b/packages/display_sh1106_multi_page.yaml
index b1fffe5..f6378c2 100644
--- a/packages/display_sh1106_multi_page.yaml
+++ b/packages/display_sh1106_multi_page.yaml
@@ -18,6 +18,23 @@ font:
     glyphs: '!"%()+=,-_.:°0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz/µ³'
 
 
+binary_sensor:
+  # True if and only if at least one non-blank page switch is on.
+  # Any new page switches should be added here
+  - platform: template
+    id: any_non_blank_page_enabled
+    internal: True
+    lambda: |-
+      return id(display_ag_default_page).state
+          || id(display_boot_page).state
+          || id(display_summary_pages).state
+          || id(display_huge_no_units_page).state
+          || id(display_air_quality_page).state
+          || id(display_air_temp_page).state
+          || id(display_voc_page).state
+          || id(display_combo_page).state;
+
+
 display:
   - platform: ssd1306_i2c
     # https://esphome.io/components/display/ssd1306.html
@@ -202,11 +219,12 @@ display:
                 - display.page.show_next: oled_display
                 - component.update: oled_display
       - to: blank
-        # Skip blank page unless it is turned on and the interval: will only display it
         then:
           - if:
+              # Only change pages if a page switch for a non-blank page is actually enabled;
+              # acts as a base case to prevent recursive page change loop
               condition:
-                switch.is_off: display_blank_page
+                binary_sensor.is_on: any_non_blank_page_enabled
               then:
                 - display.page.show_next: oled_display
                 - component.update: oled_display
@@ -227,14 +245,14 @@ interval:
     then:
       - if:
           condition:
-            # If the blank page switch is on, only display the blank page, otherwise, rotate to next page
-            switch.is_on: display_blank_page
+            and:
+              - switch.is_off: display_blank_page
+              - binary_sensor.is_on: any_non_blank_page_enabled
           then:
-            - display.page.show: blank
+            - display.page.show_next: oled_display
             - component.update: oled_display
           else:
-            # Change page on display
-            - display.page.show_next: oled_display
+            - display.page.show: blank
             - component.update: oled_display
 
 
@@ -322,8 +340,15 @@ switch:
       - display.page.show: blank
       - component.update: oled_display
     on_turn_off:
-      - display.page.show_next: oled_display
-      - component.update: oled_display
+      - if:
+          condition:
+            binary_sensor.is_on: any_non_blank_page_enabled
+          then:
+            - display.page.show_next: oled_display
+            - component.update: oled_display
+          else:
+            - display.page.show: blank
+            - component.update: oled_display
 
 number:
   - platform: template
diff --git a/packages/display_sh1106_single_page.yaml b/packages/display_sh1106_single_page.yaml
index c0e839d..e5efc49 100644
--- a/packages/display_sh1106_single_page.yaml
+++ b/packages/display_sh1106_single_page.yaml
@@ -14,6 +14,17 @@ font:
     bpp: 2
 
 
+binary_sensor:
+  # True if and only if at least one non-blank page switch is on.
+  # Any new page switches should be added here
+  - platform: template
+    id: any_non_blank_page_enabled
+    internal: True
+    lambda: |-
+      return id(display_ag_default_page).state
+          || id(display_boot_page).state;
+
+
 display:
   - platform: ssd1306_i2c
     # https://esphome.io/components/display/ssd1306.html
@@ -73,11 +84,12 @@ display:
                 - display.page.show_next: oled_display
                 - component.update: oled_display
       - to: blank
-        # Skip blank page unless it is turned on and the interval: will only display it
         then:
           - if:
+              # Only change pages if a page switch for a non-blank page is actually enabled;
+              # acts as a base case to prevent recursive page change loop
               condition:
-                switch.is_off: display_blank_page
+                binary_sensor.is_on: any_non_blank_page_enabled
               then:
                 - display.page.show_next: oled_display
                 - component.update: oled_display
@@ -98,14 +110,14 @@ interval:
     then:
       - if:
           condition:
-            # If the blank page switch is on, only display the blank page, otherwise, rotate to next page
-            switch.is_on: display_blank_page
+            and:
+              - switch.is_off: display_blank_page
+              - binary_sensor.is_on: any_non_blank_page_enabled
           then:
-            - display.page.show: blank
+            - display.page.show_next: oled_display
             - component.update: oled_display
           else:
-            # Change page on display
-            - display.page.show_next: oled_display
+            - display.page.show: blank
             - component.update: oled_display
 
 
@@ -145,8 +157,15 @@ switch:
       - display.page.show: blank
       - component.update: oled_display
     on_turn_off:
-      - display.page.show_next: oled_display
-      - component.update: oled_display
+      - if:
+          condition:
+            binary_sensor.is_on: any_non_blank_page_enabled
+          then:
+            - display.page.show_next: oled_display
+            - component.update: oled_display
+          else:
+            - display.page.show: blank
+            - component.update: oled_display
 
 number:
   - platform: template