diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp
index 9abbf4de8..f1b6a8c5c 100644
--- a/src/PowderToySDL.cpp
+++ b/src/PowderToySDL.cpp
@@ -201,14 +201,11 @@ void SDLOpen()
 			desktopWidth = rect.w;
 			desktopHeight = rect.h;
 		}
-		if (Client::Ref().GetPrefBool("AutoDrawLimit", false))
+
+		SDL_DisplayMode displayMode;
+		if (!SDL_GetCurrentDisplayMode(displayIndex, &displayMode) && displayMode.refresh_rate >= 60)
 		{
-			ui::Engine::Ref().AutoDrawingFrequencyLimit = true;
-			SDL_DisplayMode displayMode;
-			if (!SDL_GetCurrentDisplayMode(displayIndex, &displayMode) && displayMode.refresh_rate >= 60)
-			{
-				ui::Engine::Ref().SetDrawingFrequencyLimit(displayMode.refresh_rate);
-			}
+			ui::Engine::Ref().SetDrawingFrequencyLimit(displayMode.refresh_rate);
 		}
 	}
 
diff --git a/src/gui/interface/Engine.h b/src/gui/interface/Engine.h
index 496c77fd3..33dd80d6b 100644
--- a/src/gui/interface/Engine.h
+++ b/src/gui/interface/Engine.h
@@ -136,7 +136,6 @@ namespace ui
 
 	public:
 		bool MomentumScroll = true;
-		bool AutoDrawingFrequencyLimit = false;
 		bool ShowAvatars = true;
 	};
 
diff --git a/src/gui/options/OptionsController.cpp b/src/gui/options/OptionsController.cpp
index da69e286a..9ce0522ac 100644
--- a/src/gui/options/OptionsController.cpp
+++ b/src/gui/options/OptionsController.cpp
@@ -117,11 +117,6 @@ void OptionsController::SetMomentumScroll(bool momentumScroll)
 	model->SetMomentumScroll(momentumScroll);
 }
 
-void OptionsController::SetAutoDrawLimit(bool autoDrawLimit)
-{
-	model->SetAutoDrawLimit(autoDrawLimit);
-}
-
 void OptionsController::Exit()
 {
 	view->CloseActiveWindow();
diff --git a/src/gui/options/OptionsController.h b/src/gui/options/OptionsController.h
index ff1a6f404..03aee90c5 100644
--- a/src/gui/options/OptionsController.h
+++ b/src/gui/options/OptionsController.h
@@ -35,7 +35,6 @@ public:
 	void SetIncludePressure(bool includePressure);
 	void SetPerfectCircle(bool perfectCircle);
 	void SetMomentumScroll(bool momentumScroll);
-	void SetAutoDrawLimit(bool autoDrawLimit);
 	
 	void Exit();
 	OptionsView * GetView();
diff --git a/src/gui/options/OptionsModel.cpp b/src/gui/options/OptionsModel.cpp
index 58d2ffc9e..f4292f8c1 100644
--- a/src/gui/options/OptionsModel.cpp
+++ b/src/gui/options/OptionsModel.cpp
@@ -241,18 +241,6 @@ void OptionsModel::SetMomentumScroll(bool state)
 	notifySettingsChanged();
 }
 
-bool OptionsModel::GetAutoDrawLimit()
-{
-	return ui::Engine::Ref().AutoDrawingFrequencyLimit;
-}
-
-void OptionsModel::SetAutoDrawLimit(bool state)
-{
-	ui::Engine::Ref().AutoDrawingFrequencyLimit = state;
-	Client::Ref().SetPref("AutoDrawLimit", state);
-	notifySettingsChanged();
-}
-
 void OptionsModel::notifySettingsChanged()
 {
 	for (size_t i = 0; i < observers.size(); i++)
diff --git a/src/gui/options/OptionsModel.h b/src/gui/options/OptionsModel.h
index d0a6e3801..7f1ef5cc8 100644
--- a/src/gui/options/OptionsModel.h
+++ b/src/gui/options/OptionsModel.h
@@ -54,8 +54,6 @@ public:
 	void SetPerfectCircle(bool perfectCircle);
 	bool GetMomentumScroll();
 	void SetMomentumScroll(bool momentumScroll);
-	bool GetAutoDrawLimit();
-	void SetAutoDrawLimit(bool autoDrawLimit);
 	virtual ~OptionsModel();
 };
 
diff --git a/src/gui/options/OptionsView.cpp b/src/gui/options/OptionsView.cpp
index 3577f9687..17997b800 100644
--- a/src/gui/options/OptionsView.cpp
+++ b/src/gui/options/OptionsView.cpp
@@ -251,17 +251,6 @@ OptionsView::OptionsView():
 	scrollPanel->AddChild(tempLabel);
 	scrollPanel->AddChild(momentumScroll);
 
-	currentY += 20;
-	autoDrawLimit = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Auto Draw Rate", "");
-	autowidth(autoDrawLimit);
-	autoDrawLimit->SetActionCallback({ [this] { c->SetAutoDrawLimit(autoDrawLimit->GetChecked()); } });
-	tempLabel = new ui::Label(ui::Point(autoDrawLimit->Position.X + Graphics::textwidth(autoDrawLimit->GetText()) + 20, currentY), ui::Point(1, 16), "\bg- Based on monitor refresh rate at startup");
-	autowidth(tempLabel);
-	tempLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
-	tempLabel->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
-	scrollPanel->AddChild(tempLabel);
-	scrollPanel->AddChild(autoDrawLimit);
-
 	currentY+=20;
 	mouseClickRequired = new ui::Checkbox(ui::Point(8, currentY), ui::Point(1, 16), "Sticky Categories", "");
 	autowidth(mouseClickRequired);
@@ -362,7 +351,6 @@ void OptionsView::NotifySettingsChanged(OptionsModel * sender)
 	includePressure->SetChecked(sender->GetIncludePressure());
 	perfectCirclePressure->SetChecked(sender->GetPerfectCircle());
 	momentumScroll->SetChecked(sender->GetMomentumScroll());
-	autoDrawLimit->SetChecked(sender->GetAutoDrawLimit());
 }
 
 void OptionsView::AttachController(OptionsController * c_)
diff --git a/src/gui/options/OptionsView.h b/src/gui/options/OptionsView.h
index a3c2d0643..d564bdeb0 100644
--- a/src/gui/options/OptionsView.h
+++ b/src/gui/options/OptionsView.h
@@ -32,7 +32,6 @@ class OptionsView: public ui::Window
 	ui::DropDown * decoSpace;
 	ui::Checkbox * showAvatars;
 	ui::Checkbox * momentumScroll;
-	ui::Checkbox * autoDrawLimit;
 	ui::Checkbox * mouseClickRequired;
 	ui::Checkbox * includePressure;
 	ui::Checkbox * perfectCirclePressure;