diff --git a/src/control/tools/EditSelection.cpp b/src/control/tools/EditSelection.cpp
index 2b345ff2..b3eaf88a 100644
--- a/src/control/tools/EditSelection.cpp
+++ b/src/control/tools/EditSelection.cpp
@@ -644,6 +644,12 @@ CursorSelectionType EditSelection::getSelectionTypeForPos(double x, double y, do
 
 void EditSelection::snapRotation()
 {
+	bool snapping = this->view->getXournal()->getControl()->isRotationSnapping();
+	if (!snapping)
+	{
+		return;
+	}
+	
 	double epsilon = 0.1;
 	const double ROTATION_LOCK[8] = {0, M_PI / 2.0, M_PI, M_PI / 4.0, 3.0 * M_PI / 4.0,
 									- M_PI / 4.0, - 3.0 * M_PI / 4.0, - M_PI / 2.0};