diff --git a/zerver/migrations/0048_enter_sends_default_to_false.py b/zerver/migrations/0048_enter_sends_default_to_false.py
new file mode 100644
index 0000000000..9fae085d86
--- /dev/null
+++ b/zerver/migrations/0048_enter_sends_default_to_false.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2016-12-29 02:18
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('zerver', '0047_realm_add_emoji_by_admins_only'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userprofile',
+            name='enter_sends',
+            field=models.NullBooleanField(default=False),
+        ),
+    ]
diff --git a/zerver/models.py b/zerver/models.py
index cd3abc3e72..88ac6aa659 100644
--- a/zerver/models.py
+++ b/zerver/models.py
@@ -543,7 +543,7 @@ class UserProfile(ModelReprMixin, AbstractBaseUser, PermissionsMixin):
     default_all_public_streams = models.BooleanField(default=False) # type: bool
 
     # UI vars
-    enter_sends = models.NullBooleanField(default=True) # type: Optional[bool]
+    enter_sends = models.NullBooleanField(default=False) # type: Optional[bool]
     autoscroll_forever = models.BooleanField(default=False) # type: bool
     left_side_userlist = models.BooleanField(default=False) # type: bool