--- a/mobile/android/base/java/org/mozilla/gecko/bookmarks/BookmarkUtils.java
+++ b/mobile/android/base/java/org/mozilla/gecko/bookmarks/BookmarkUtils.java
@@ -13,12 +13,15 @@ import org.mozilla.gecko.switchboard.Swi
 
 public class BookmarkUtils {
 
     /**
      * Get the switch from {@link SwitchBoard}. It's used to enable/disable
      * full bookmark management features(full-page dialog, bookmark/folder modification, etc.)
      */
     public static boolean isEnabled(Context context) {
-        return AppConstants.NIGHTLY_BUILD &&
-                       SwitchBoard.isInExperiment(context, Experiments.FULL_BOOKMARK_MANAGEMENT);
+        final boolean initialized = SwitchBoard.hasExperimentValues(context, Experiments.FULL_BOOKMARK_MANAGEMENT);
+        if (!initialized) {
+            return true;
+        }
+        return SwitchBoard.isInExperiment(context, Experiments.FULL_BOOKMARK_MANAGEMENT);
     }
 }