diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx
index bc7ef7d8edc25b632392f66655e24b398f8c49f3..17850ed98106a32cb28dff983d12a1fcc2080962 100644
--- a/src/containers/blocks.jsx
+++ b/src/containers/blocks.jsx
@@ -386,6 +386,7 @@ class Blocks extends React.Component {
             optVarType !== this.ScratchBlocks.BROADCAST_MESSAGE_VARIABLE_TYPE &&
             p.prompt.title !== this.ScratchBlocks.Msg.RENAME_VARIABLE_MODAL_TITLE &&
             p.prompt.title !== this.ScratchBlocks.Msg.RENAME_LIST_MODAL_TITLE;
+        p.prompt.showCloudOption = (optVarType === this.ScratchBlocks.SCALAR_VARIABLE_TYPE) && this.props.canUseCloud;
         this.setState(p);
     }
     handleConnectionModalStart (extensionId) {
@@ -462,7 +463,7 @@ class Blocks extends React.Component {
                         isStage={vm.runtime.getEditingTarget().isStage}
                         label={this.state.prompt.message}
                         placeholder={this.state.prompt.defaultValue}
-                        showCloudOption={canUseCloud}
+                        showCloudOption={this.state.prompt.showCloudOption}
                         showVariableOptions={this.state.prompt.showVariableOptions}
                         title={this.state.prompt.title}
                         vm={vm}