diff --git a/ghost/admin/app/controllers/settings/membership.js b/ghost/admin/app/controllers/settings/membership.js
index 9de6173f26..d04dbf0d06 100644
--- a/ghost/admin/app/controllers/settings/membership.js
+++ b/ghost/admin/app/controllers/settings/membership.js
@@ -111,7 +111,7 @@ export default class MembersAccessController extends Controller {
             // when saved value is 'none' the server won't inject the portal script
             // to work around that and show the expected portal preview we save and
             // force a refresh
-            await this.saveSettingsTask.perform({forceRefresh: true});
+            await this.switchFromNoneTask.perform();
         } else {
             this.updatePortalPreview();
         }
@@ -257,6 +257,11 @@ export default class MembersAccessController extends Controller {
         this.resizePortalPreviewTask.cancelAll();
     }
 
+    @task
+    *switchFromNoneTask() {
+        return yield this.saveSettingsTask.perform({forceRefresh: true});
+    }
+
     @task({restartable: true})
     *resizePortalPreviewTask() {
         if (this.portalPreviewIframe && this.portalPreviewIframe.contentWindow) {
diff --git a/ghost/admin/app/templates/settings/membership.hbs b/ghost/admin/app/templates/settings/membership.hbs
index 2f3e81efd0..cb4d06c4e1 100644
--- a/ghost/admin/app/templates/settings/membership.hbs
+++ b/ghost/admin/app/templates/settings/membership.hbs
@@ -48,7 +48,7 @@
             </div>
             <div class="gh-setting-members-portalpreview">
                 <div class="gh-setting-members-portal-mock">
-                    {{#if (eq this.settings.membersSignupAccess 'none')}}
+                    {{#if (or (eq this.settings.membersSignupAccess 'none') this.switchFromNoneTask.isRunning)}}
                         <div class="gh-setting-members-portal-disabled">
                             <span class="lightgrey">{{svg-jar "portal-logo-stroke"}}</span>
                             <h4>Portal disabled</h4>