diff --git a/acf.php b/acf.php
index ce0730d..6cfd5d6 100644
--- a/acf.php
+++ b/acf.php
@@ -9,7 +9,7 @@
  * Plugin Name:       Advanced Custom Fields PRO
  * Plugin URI:        https://www.advancedcustomfields.com
  * Description:       Customize WordPress with powerful, professional and intuitive fields.
- * Version:           6.2.1
+ * Version:           6.2.1.1
  * Author:            WP Engine
  * Author URI:        https://wpengine.com/?utm_source=wordpress.org&utm_medium=referral&utm_campaign=plugin_directory&utm_content=advanced_custom_fields
  * Update URI:        https://www.advancedcustomfields.com/pro
@@ -36,7 +36,7 @@ if ( ! class_exists( 'ACF' ) ) {
 		 *
 		 * @var string
 		 */
-		public $version = '6.2.1';
+		public $version = '6.2.1.1';
 
 		/**
 		 * The plugin settings array.
diff --git a/includes/admin/post-types/admin-field-group.php b/includes/admin/post-types/admin-field-group.php
index 18d3fae..9edff29 100644
--- a/includes/admin/post-types/admin-field-group.php
+++ b/includes/admin/post-types/admin-field-group.php
@@ -122,12 +122,12 @@ if ( ! class_exists( 'acf_admin_field_group' ) ) :
 				)
 			);
 
-			if ( acf_is_pro() ) {
+			if ( acf_is_pro() && acf_get_setting( 'enable_options_pages_ui' ) ) {
 				acf_localize_data(
 					array(
 						'acfParentPageChoices' => ACF_Admin_UI_Options_Page::get_parent_page_choices(),
 					)
-				);	
+				);
 			}
 
 			acf_localize_data(
diff --git a/pro/locations/class-acf-location-options-page.php b/pro/locations/class-acf-location-options-page.php
index 5691fe4..f23d091 100644
--- a/pro/locations/class-acf-location-options-page.php
+++ b/pro/locations/class-acf-location-options-page.php
@@ -70,7 +70,9 @@ if ( ! class_exists( 'ACF_Location_Options_Page' ) ) :
 				$choices[''] = __( 'Select options page...', 'acf' );
 			}
 
-			$choices['add_new_options_page'] = __( 'Add New Options Page', 'acf' );
+			if ( acf_get_setting( 'enable_options_pages_ui' ) ) {
+				$choices['add_new_options_page'] = __( 'Add New Options Page', 'acf' );
+			}
 
 			// Return choices.
 			return $choices;
diff --git a/readme.txt b/readme.txt
index 6bd0c6e..8f71fed 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Tags: acf, fields, custom fields, meta, repeater
 Requires at least: 5.8
 Tested up to: 6.3
 Requires PHP: 7.0
-Stable tag: 6.2.1
+Stable tag: 6.2.1.1
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -92,6 +92,11 @@ From your WordPress dashboard
 
 == Changelog ==
 
+= 6.2.1.1 =
+*Release Date 8th September 2023*
+
+* Fix - Editing a field group no longer generates an error when UI options pages are disabled
+
 = 6.2.1 =
 *Release Date 7th September 2023*