diff --git a/indra/newview/llfloaterhardwaresettings.cpp b/indra/newview/llfloaterhardwaresettings.cpp
index 93ab89aa3d1aade244708b1694796385e4f15f6d..757558e4bad2bdc371b95c44d55de486cd6dde3a 100755
--- a/indra/newview/llfloaterhardwaresettings.cpp
+++ b/indra/newview/llfloaterhardwaresettings.cpp
@@ -150,9 +150,9 @@ BOOL LLFloaterHardwareSettings::postBuild()
 {
 	childSetAction("OK", onBtnOK, this);
 
-// Don't do this on Mac as their braindead GL versioning
-// sets this when 8x and 16x are indeed available
-//
+	// Don't do this on Mac as their braindead GL versioning
+	// sets this when 8x and 16x are indeed available
+	//
 #if !LL_DARWIN
 	if (gGLManager.mIsIntel || gGLManager.mGLVersion < 3.f)
 	{ //remove FSAA settings above "4x"
@@ -167,6 +167,12 @@ BOOL LLFloaterHardwareSettings::postBuild()
 	combo->remove(2);
 #endif
 
+	if (!gGLManager.mHasAdaptiveVSync)
+	{
+		LLComboBox* combo = getChild<LLComboBox>("vertical_sync");
+		combo->remove(2);
+	}
+
 	refresh();
 	center();