diff --git a/msnf.module b/msnf.module
index e2ce5fc..9a30fc4 100644
--- a/msnf.module
+++ b/msnf.module
@@ -1207,7 +1207,7 @@ function _msnf_form_attach_buttons(&$form, &$form_state) {
     $skip_next &= $next_step->format_settings['instance_settings']['skip_non_required'];
     // The last step may never be skipped.
     $skip_next &= $current_index < (count($steps) - 2);
-    if ($skip_next) {
+    if ($skip_next && !empty($step_settings['buttons']['skip'])) {
       // Add "next" button.
       $form['actions']['skip'] = array(
         '#type' => 'submit',