diff --git a/build.gradle b/build.gradle
index 478c2808f4c..b4c9bd1dc65 100644
--- a/build.gradle
+++ b/build.gradle
@@ -174,7 +174,6 @@ android {
         buildConfigField "String", "REDPHONE_RELAY_HOST", "\"relay.whispersystems.org\""
         buildConfigField "String", "REDPHONE_PREFIX_NAME", "\".whispersystems.org\""
         buildConfigField "boolean", "DEV_BUILD", "false"
-        buildConfigField "boolean", "FORCE_WEBSOCKETS", "false"
     }
 
     compileOptions {
@@ -224,10 +223,6 @@ android {
             applicationIdSuffix ".dev"
             versionNameSuffix "-dev"
         }
-        websockets.initWith(buildTypes.dev)
-        websockets {
-            buildConfigField "boolean", "FORCE_WEBSOCKETS", "true"
-        }
     }
 
     productFlavors {
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3f0d81eebe9..2a5b9466693 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -840,6 +840,8 @@
     <string name="preferences__input_settings">Input Settings</string>
     <string name="preferences__enable_enter_key_title">Enable Enter key</string>
     <string name="preferences__replace_smiley_with_enter_key">Replace the smiley key with an Enter key</string>
+    <string name="preferences__pref_force_websocket_title">Force WebSocket</string>
+    <string name="preferences__always_use_websocket_instead_of_gcm">Always use WebSocket instead of GCM</string>
     <string name="preferences__pref_enter_sends_title">Enter key sends</string>
     <string name="preferences__pressing_the_enter_key_will_send_text_messages">Pressing the Enter key will send text messages</string>
     <string name="preferences__display_settings">Display settings</string>
diff --git a/res/xml/preferences_advanced.xml b/res/xml/preferences_advanced.xml
index 1c7702a3851..52c13e84edd 100644
--- a/res/xml/preferences_advanced.xml
+++ b/res/xml/preferences_advanced.xml
@@ -7,6 +7,12 @@
                         android:title="@string/preferences__signal"
                         android:summary="@string/preferences__use_the_data_channel_for_communication_with_other_signal_users"/>
 
+    <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+                        android:defaultValue="false"
+                        android:key="pref_force_websocket"
+                        android:summary="@string/preferences__always_use_websocket_instead_of_gcm"
+                        android:title="@string/preferences__pref_force_websocket_title"/>
+
     <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
                         android:defaultValue="false"
                         android:key="pref_enter_sends"
diff --git a/src/org/thoughtcrime/securesms/jobs/GcmRefreshJob.java b/src/org/thoughtcrime/securesms/jobs/GcmRefreshJob.java
index 31f3350c401..e5fa91963ae 100644
--- a/src/org/thoughtcrime/securesms/jobs/GcmRefreshJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/GcmRefreshJob.java
@@ -67,7 +67,7 @@ public void onRun() throws Exception {
       Log.w(TAG, "GCM registrationId expired, reregistering...");
       int result = GooglePlayServicesUtil.isGooglePlayServicesAvailable(context);
 
-      if (result != ConnectionResult.SUCCESS || BuildConfig.FORCE_WEBSOCKETS) {
+      if (result != ConnectionResult.SUCCESS || TextSecurePreferences.isForceWebsocketEnabled(context)) {
         notifyGcmFailure();
       } else {
         String gcmId = GoogleCloudMessaging.getInstance(context).register(REGISTRATION_ID);
diff --git a/src/org/thoughtcrime/securesms/service/RegistrationService.java b/src/org/thoughtcrime/securesms/service/RegistrationService.java
index ae108355c20..d5fb9b62116 100644
--- a/src/org/thoughtcrime/securesms/service/RegistrationService.java
+++ b/src/org/thoughtcrime/securesms/service/RegistrationService.java
@@ -245,7 +245,7 @@ private void handleCommonRegistration(TextSecureAccountManager accountManager, S
     accountManager.setPreKeys(identityKey.getPublicKey(),lastResort, signedPreKey, records);
 
     if (GooglePlayServicesUtil.isGooglePlayServicesAvailable(this) == ConnectionResult.SUCCESS &&
-        !BuildConfig.FORCE_WEBSOCKETS)
+        !TextSecurePreferences.isForceWebsocketEnabled(this))
     {
       setState(new RegistrationState(RegistrationState.STATE_GCM_REGISTERING, number));
 
@@ -260,17 +260,16 @@ private void handleCommonRegistration(TextSecureAccountManager accountManager, S
     DatabaseFactory.getIdentityDatabase(this).saveIdentity(self.getRecipientId(), identityKey.getPublicKey());
     DirectoryHelper.refreshDirectory(this, accountManager, number);
 
-    //if (GooglePlayServicesUtil.isGooglePlayServicesAvailable(this) == ConnectionResult.SUCCESS &&
-    //    !BuildConfig.FORCE_WEBSOCKETS)
-    //{
-    //  RedPhoneAccountManager redPhoneAccountManager = new RedPhoneAccountManager(BuildConfig.REDPHONE_MASTER_URL,
-    //                                                                           new RedPhoneTrustStore(this),
-    //                                                                           number, password);
-    //  String verificationToken = accountManager.getAccountVerificationToken();
-    //  redPhoneAccountManager.createAccount(verificationToken, new RedPhoneAccountAttributes(signalingKey,
-    //          TextSecurePreferences.getGcmRegistrationId(this)));
-    //}
-    accountManager.getAccountVerificationToken();
+    String verificationToken = accountManager.getAccountVerificationToken();
+    if (GooglePlayServicesUtil.isGooglePlayServicesAvailable(this) == ConnectionResult.SUCCESS &&
+        !TextSecurePreferences.isForceWebsocketEnabled(this))
+    {
+      RedPhoneAccountManager redPhoneAccountManager = new RedPhoneAccountManager(BuildConfig.REDPHONE_MASTER_URL,
+                                                                                 new RedPhoneTrustStore(this),
+                                                                                 number, password);
+      redPhoneAccountManager.createAccount(verificationToken, new RedPhoneAccountAttributes(signalingKey,
+              TextSecurePreferences.getGcmRegistrationId(this)));
+    }
 
     DirectoryRefreshListener.schedule(this);
   }
diff --git a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
index a6df72a48ee..3155e7d4130 100644
--- a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
+++ b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
@@ -56,6 +56,7 @@ public class TextSecurePreferences {
   public  static final String PASSPHRASE_TIMEOUT_INTERVAL_PREF = "pref_timeout_interval";
   private static final String PASSPHRASE_TIMEOUT_PREF          = "pref_timeout_passphrase";
   public  static final String SCREEN_SECURITY_PREF             = "pref_screen_security";
+  private static final String FORCE_WEBSOCKET_PREF             = "pref_force_websocket";
   private static final String ENTER_SENDS_PREF                 = "pref_enter_sends";
   private static final String ENTER_PRESENT_PREF               = "pref_enter_key";
   private static final String SMS_DELIVERY_REPORT_PREF         = "pref_delivery_report_sms";
@@ -212,6 +213,10 @@ public static String getSignalingKey(Context context) {
     return getStringPreference(context, SIGNALING_KEY_PREF, null);
   }
 
+  public static boolean isForceWebsocketEnabled(Context context) {
+    return getBooleanPreference(context, FORCE_WEBSOCKET_PREF, false);
+  }
+
   public static boolean isEnterImeKeyEnabled(Context context) {
     return getBooleanPreference(context, ENTER_PRESENT_PREF, false);
   }
diff --git a/test/androidTestEspresso/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragmentActions.java b/test/androidTestEspresso/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragmentActions.java
index 2fad603548c..9220a0bac55 100644
--- a/test/androidTestEspresso/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragmentActions.java
+++ b/test/androidTestEspresso/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragmentActions.java
@@ -28,6 +28,10 @@ public static void clickTextSecureMessages() throws Exception {
     onData(Matchers.<Object>allOf(withKey("pref_toggle_push_messaging"))).perform(click());
   }
 
+  public static void clickForceWebsocket() throws Exception {
+    onData(Matchers.<Object>allOf(withKey("pref_force_websocket"))).perform(click());
+  }
+
   public static void clickEnterKeySends() throws Exception {
     onData(Matchers.<Object>allOf(withKey("pref_enter_sends"))).perform(click());
   }
diff --git a/test/androidTestEspresso/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragmentTest.java b/test/androidTestEspresso/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragmentTest.java
index 3eb987c4ad4..f34be844cb2 100644
--- a/test/androidTestEspresso/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragmentTest.java
+++ b/test/androidTestEspresso/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragmentTest.java
@@ -51,6 +51,8 @@ public AdvancedPreferenceFragmentTest() {
   private void checkAllPreferencesDisplayed() throws Exception {
     onData(Matchers.<Object>allOf(withKey("pref_toggle_push_messaging")))
           .check(matches(isDisplayed()));
+    onData(Matchers.<Object>allOf(withKey("pref_force_websocket")))
+          .check(matches(isDisplayed()));
     onData(Matchers.<Object>allOf(withKey("pref_enter_sends")))
           .check(matches(isDisplayed()));
     onData(Matchers.<Object>allOf(withKey("pref_submit_debug_logs")))
@@ -70,6 +72,12 @@ private void checkViewsMatchPreferences() throws Exception {
       isNotChecked().matches(onData(Matchers.<Object>allOf(withKey("pref_toggle_push_messaging"))));
     }
 
+    if (TextSecurePreferences.isForceWebsocketEnabled(getContext())) {
+      isChecked().matches(onData(Matchers.<Object>allOf(withKey("pref_force_websocket"))));
+    } else {
+      isNotChecked().matches(onData(Matchers.<Object>allOf(withKey("pref_force_websocket"))));
+    }
+
     if (TextSecurePreferences.isEnterSendsEnabled(getContext())) {
       isChecked().matches(onData(Matchers.<Object>allOf(withKey("pref_enter_sends"))));
     } else {