diff --git a/WordPress/src/main/java/org/wordpress/android/WordPress.java b/WordPress/src/main/java/org/wordpress/android/WordPress.java
index ebb840be9eab..b1da26a4baf9 100644
--- a/WordPress/src/main/java/org/wordpress/android/WordPress.java
+++ b/WordPress/src/main/java/org/wordpress/android/WordPress.java
@@ -216,16 +216,6 @@ public void onCreate() {
 
         // If users uses a custom locale set it on start of application
         WPActivityUtils.applyLocale(getContext());
-
-        // TODO: remove this after the visual editor is enabled in a release version (5.4 if everything goes well)
-        enableVisualEditorForBetaUsers();
-    }
-
-    private void enableVisualEditorForBetaUsers() {
-        if (BuildConfig.VERSION_NAME.contains("5.4-rc")) {
-            AppPrefs.setVisualEditorAvailable(true);
-            AppPrefs.setVisualEditorEnabled(true);
-        }
     }
 
     private void initAnalytics(final long elapsedTimeOnCreate) {
diff --git a/WordPress/src/main/java/org/wordpress/android/WordPressDB.java b/WordPress/src/main/java/org/wordpress/android/WordPressDB.java
index 8c8a50bd7e4f..006ced4f4630 100644
--- a/WordPress/src/main/java/org/wordpress/android/WordPressDB.java
+++ b/WordPress/src/main/java/org/wordpress/android/WordPressDB.java
@@ -85,7 +85,7 @@ public class WordPressDB {
     public static final String COLUMN_NAME_VIDEO_PRESS_SHORTCODE = "videoPressShortcode";
     public static final String COLUMN_NAME_UPLOAD_STATE          = "uploadState";
 
-    private static final int DATABASE_VERSION = 46;
+    private static final int DATABASE_VERSION = 47;
 
     private static final String CREATE_TABLE_BLOGS = "create table if not exists accounts (id integer primary key autoincrement, "
             + "url text, blogName text, username text, password text, imagePlacement text, centerThumbnail boolean, fullSizeImage boolean, maxImageWidth text, maxImageWidthId integer);";
@@ -419,6 +419,10 @@ public WordPressDB(Context ctx) {
             case 45:
                 db.execSQL(ADD_BLOGS_CAPABILITIES);
                 currentVersion++;
+            case 46:
+                AppPrefs.setVisualEditorAvailable(true);
+                AppPrefs.setVisualEditorEnabled(true);
+                currentVersion++;
         }
         db.setVersion(DATABASE_VERSION);
     }