diff --git a/e2e/test/scenarios/permissions/downgrade-ee-to-oss.cy.spec.js b/e2e/test/scenarios/permissions/downgrade-ee-to-oss.cy.spec.js
index 7cea798414925aee8962e7eae2bbe4a1dfb7ac7b..5b79f69b04514656de4cf94e72ea779fd795a20c 100644
--- a/e2e/test/scenarios/permissions/downgrade-ee-to-oss.cy.spec.js
+++ b/e2e/test/scenarios/permissions/downgrade-ee-to-oss.cy.spec.js
@@ -41,36 +41,38 @@ describeEE("scenarios > admin > permissions > downgrade ee to oss", () => {
       cy.button("Yes").click();
     });
 
-    setTokenFeatures("none");
-    cy.reload();
-
-    assertPermissionTable([["Sample Database", "No"]]);
-    isPermissionDisabled(OSS_NATIVE_QUERIES_PERMISSION_INDEX, "No", false);
-
-    modifyPermission(
-      "Sample Database",
-      OSS_NATIVE_QUERIES_PERMISSION_INDEX,
-      "Query builder and native",
-    );
-    cy.button("Save changes").click();
-    modal().within(() => {
-      cy.findByText("Save permissions?");
-      cy.button("Yes").click();
-    });
+    setTokenFeatures("none").then(() => {
+      cy.reload();
 
-    setTokenFeatures("all");
-    cy.reload();
+      assertPermissionTable([["Sample Database", "No"]]);
+      isPermissionDisabled(OSS_NATIVE_QUERIES_PERMISSION_INDEX, "No", false);
 
-    assertPermissionTable([
-      [
+      modifyPermission(
         "Sample Database",
-        "Can view",
+        OSS_NATIVE_QUERIES_PERMISSION_INDEX,
         "Query builder and native",
-        "No",
-        "No",
-        "No",
-      ],
-    ]);
+      );
+      cy.button("Save changes").click();
+      modal().within(() => {
+        cy.findByText("Save permissions?");
+        cy.button("Yes").click();
+      });
+
+      setTokenFeatures("all").then(() => {
+        cy.reload();
+
+        assertPermissionTable([
+          [
+            "Sample Database",
+            "Can view",
+            "Query builder and native",
+            "No",
+            "No",
+            "No",
+          ],
+        ]);
+      });
+    });
   });
 
   // same context as other test, but also make sure that other rows with EE values are