diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 90c3460..8dc3d53 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -553,7 +553,11 @@
                 return true;
             }
             case R.id.data_usage_menu_auto_sync: {
-                ConfirmAutoSyncChangeFragment.show(this, !item.isChecked());
+                if (ActivityManager.isUserAMonkey()) {
+                    Log.d("SyncState", "ignoring monkey's attempt to flip global sync state");
+                } else {
+                    ConfirmAutoSyncChangeFragment.show(this, !item.isChecked());
+                }
                 return true;
             }
         }
diff --git a/src/com/android/settings/accounts/SyncSettings.java b/src/com/android/settings/accounts/SyncSettings.java
index 20c296a..3248113 100644
--- a/src/com/android/settings/accounts/SyncSettings.java
+++ b/src/com/android/settings/accounts/SyncSettings.java
@@ -20,6 +20,7 @@
 import android.accounts.AccountManager;
 import android.accounts.OnAccountsUpdateListener;
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.content.ContentResolver;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
@@ -56,7 +57,11 @@
         mAutoSyncPreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {
-                ContentResolver.setMasterSyncAutomatically((Boolean) newValue);
+                if (ActivityManager.isUserAMonkey()) {
+                    Log.d("SyncSettings", "ignoring monkey's attempt to flip sync state");
+                } else {
+                    ContentResolver.setMasterSyncAutomatically((Boolean) newValue);
+                }
                 return true;
             }
         });
diff --git a/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java b/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java
index 13081dd..db746ee 100644
--- a/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java
+++ b/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java
@@ -17,9 +17,11 @@
 package com.android.settings.accounts;
 
 import android.accounts.Account;
+import android.app.ActivityManager;
 import android.content.Context;
 import android.preference.CheckBoxPreference;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 
@@ -131,7 +133,11 @@
         // When we're in one-time sync mode, we don't want a click to change the
         // checkbox state
         if (!mOneTimeSyncMode) {
-            super.onClick();
+            if (ActivityManager.isUserAMonkey()) {
+                Log.d("SyncState", "ignoring monkey's attempt to flip sync state");
+            } else {
+                super.onClick();
+            }
         }
     }
 
