diff --git a/Changelog.md b/Changelog.md
index 10b553587..45fe4e639 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -11,7 +11,7 @@ Compiler Features:
  * Yul Optimizer: Apply penalty when trying to rematerialize into loops.
 
 Bugfixes:
-
+ * Commandline interface: Only activate yul optimizer if ``--optimize`` is given.
 
 Build System:
  * Switch to building soljson.js with an embedded base64-encoded wasm binary.
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index de7814785..1598bbb68 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -1113,7 +1113,8 @@ bool CommandLineInterface::processInput()
 
 		OptimiserSettings settings = m_args.count(g_argOptimize) ? OptimiserSettings::standard() : OptimiserSettings::minimal();
 		settings.expectedExecutionsPerDeployment = m_args[g_argOptimizeRuns].as<unsigned>();
-		settings.runYulOptimiser = !m_args.count(g_strNoOptimizeYul);
+		if (m_args.count(g_strNoOptimizeYul))
+			settings.runYulOptimiser = false;
 		settings.optimizeStackAllocation = settings.runYulOptimiser;
 		m_compiler->setOptimiserSettings(settings);