diff --git a/src/preferences/virtualmemory/SettingsWindow.cpp b/src/preferences/virtualmemory/SettingsWindow.cpp
index 9b09f1da02..01e7687755 100644
--- a/src/preferences/virtualmemory/SettingsWindow.cpp
+++ b/src/preferences/virtualmemory/SettingsWindow.cpp
@@ -364,10 +364,11 @@ SettingsWindow::MessageReceived(BMessage* message)
 				}
 			}
 
-			fSettings.SetSwapEnabled(value != 0);
-			if (value == 1 && fSettings.SwapSize() == 0)
-			{
-				off_t min, max;
+			bool enabled = value != 0;
+			fSettings.SetSwapEnabled(enabled);
+			if (enabled && fSettings.SwapSize() == 0) {
+				off_t min;
+				off_t max;
 				_GetSwapFileLimits(min, max);
 				fSettings.SetSwapSize(min);
 			}