diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index d2c391fdb358500d1ed38455533487f17a35500d..67cc5e9bd349c74aa128b61030361225abcdcff9 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -119,7 +119,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
         $view->showNextStep = !$view->diagnosticReport->hasErrors();
 
         // On the system check page, if all is green, display Next link at the top
-        $view->showNextStepAtTop = $view->showNextStep;
+        $view->showNextStepAtTop = $view->showNextStep && !$view->diagnosticReport->hasWarnings();
 
         return $view->render();
     }