diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 0803b836efd..f2c18a1f984 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -3,7 +3,7 @@
 -----
 - [*] Tap To Pay: Changed navigation from Tap To Pay Summary screen to About Tap To Pay [https://github.com/woocommerce/woocommerce-android/pull/11411]
 - [*] Tap To Pay: Change description of how Tap To Pay works, excluding simple payments [https://github.com/woocommerce/woocommerce-android/pull/11411]
-
+- [*] Shipping: A shipping method can now be selected when adding or editing shipping on an order [https://github.com/woocommerce/woocommerce-android/pull/11481]
 
 18.5
 -----
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt
index e692f77f964..0384d2817bd 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt
@@ -29,14 +29,14 @@ enum class FeatureFlag {
             MORE_MENU_INBOX,
             WC_SHIPPING_BANNER,
             BETTER_CUSTOMER_SEARCH_M2,
-            ORDER_CREATION_AUTO_TAX_RATE,
-            EOSL_M1 -> PackageUtils.isDebugBuild()
+            ORDER_CREATION_AUTO_TAX_RATE -> PackageUtils.isDebugBuild()
 
             DYNAMIC_DASHBOARD,
             CONNECTIVITY_TOOL,
             CUSTOM_RANGE_ANALYTICS,
             NEW_SHIPPING_SUPPORT,
-            APP_PASSWORD_TUTORIAL -> true
+            APP_PASSWORD_TUTORIAL,
+            EOSL_M1 -> true
         }
     }
 }