diff --git a/DeviceSettings/src/com/aosip/device/DeviceSettings/DeviceSettings.java b/DeviceSettings/src/com/aosip/device/DeviceSettings/DeviceSettings.java
index c61a024d..ef3f8e81 100644
--- a/DeviceSettings/src/com/aosip/device/DeviceSettings/DeviceSettings.java
+++ b/DeviceSettings/src/com/aosip/device/DeviceSettings/DeviceSettings.java
@@ -85,8 +85,8 @@ public class DeviceSettings extends PreferenceFragment
         getActivity().getActionBar().setDisplayHomeAsUpEnabled(true);
 
         mVibratorStrength = (VibratorStrengthPreference) findPreference(KEY_VIBSTRENGTH);
-        if (mVibratorStrength != null) {
-            mVibratorStrength.setEnabled(VibratorStrengthPreference.isSupported());
+        if (mVibratorStrength == null || !VibratorStrengthPreference.isSupported()) {
+            getPreferenceScreen().removePreference((Preference) findPreference("vibrator"));
         }
 
         mTopKeyPref = (ListPreference) findPreference(Constants.NOTIF_SLIDER_TOP_KEY);