diff --git a/client/modules/IDE/components/Editor.js b/client/modules/IDE/components/Editor.js
index f62cb4a4..d08cfb77 100644
--- a/client/modules/IDE/components/Editor.js
+++ b/client/modules/IDE/components/Editor.js
@@ -68,11 +68,14 @@ class Editor extends React.Component {
     this._cm.on('change', debounce(1000, () => {
       this.props.setUnsavedChanges(true);
       this.props.updateFileContent(this.props.file.name, this._cm.getValue());
-      this.checkForInfiniteLoop((infiniteLoop, prevs) => {
-        if (!infiniteLoop && prevs && this.props.autorefresh) {
-          this.props.startRefreshSketch();
-        }
-      });
+      if (this.props.autorefresh && this.props.isPlaying) {
+        this.props.startRefreshSketch();
+      }
+      // this.checkForInfiniteLoop((infiniteLoop, prevs) => {
+      //   if (!infiniteLoop && prevs && this.props.autorefresh) {
+      //     this.props.startRefreshSketch();
+      //   }
+      // });
     }));
 
     this._cm.on('keyup', () => {
diff --git a/client/modules/IDE/components/Toolbar.js b/client/modules/IDE/components/Toolbar.js
index 831edb34..4804c981 100644
--- a/client/modules/IDE/components/Toolbar.js
+++ b/client/modules/IDE/components/Toolbar.js
@@ -72,7 +72,7 @@ class Toolbar extends React.Component {
         >
           <InlineSVG src={stopUrl} alt="Stop Sketch" />
         </button>
-        <div className="toolbar__autorefresh">
+        {/* <div className="toolbar__autorefresh">
           <input
             id="autorefresh"
             type="checkbox"
@@ -84,7 +84,7 @@ class Toolbar extends React.Component {
           <label htmlFor="autorefresh" className="toolbar__autorefresh-label">
             Auto-refresh
           </label>
-        </div>
+        </div> */}
         <div className={nameContainerClass}>
           <a
             className="toolbar__project-name"
diff --git a/client/modules/IDE/reducers/preferences.js b/client/modules/IDE/reducers/preferences.js
index 5a82e5b1..219c2b31 100644
--- a/client/modules/IDE/reducers/preferences.js
+++ b/client/modules/IDE/reducers/preferences.js
@@ -8,7 +8,7 @@ const initialState = {
   lintWarning: false,
   textOutput: false,
   theme: 'light',
-  autorefresh: true
+  autorefresh: false
 };
 
 const preferences = (state = initialState, action) => {
diff --git a/server/models/user.js b/server/models/user.js
index 6982086f..1c9b93a3 100644
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -17,7 +17,7 @@ const userSchema = new Schema({
     lintWarning: { type: Boolean, default: false },
     textOutput: { type: Boolean, default: false },
     theme: { type: String, default: 'light' },
-    autorefresh: { type: Boolean, default: true }
+    autorefresh: { type: Boolean, default: false }
   }
 }, { timestamps: true });
 
diff --git a/server/utils/db_reformat.js b/server/utils/db_reformat.js
index 10be6c70..9aca9c58 100644
--- a/server/utils/db_reformat.js
+++ b/server/utils/db_reformat.js
@@ -117,11 +117,21 @@ import User from '../models/user';
 //     });
 //   });
 
-User.findOne({email: 'test@test.com'})
-  .exec((err, user) => {
-    console.log(user);
-    user.password = '1234';
-    user.save((err, savedUser) => {
-      console.log('user saved');
+// User.findOne({email: 'test@test.com'})
+//   .exec((err, user) => {
+//     console.log(user);
+//     user.password = '1234';
+//     user.save((err, savedUser) => {
+//       console.log('user saved');
+//     });
+//   });
+
+User.find({})
+  .exec((err, users) => {
+    users.forEach(user => {
+      user.preferences.autorefresh = false;
+      user.save((err, savedUser) => {
+        console.log('user saved');
+      });
     });
   });
\ No newline at end of file