diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm
index 56c70f456..fb7c4923f 100644
--- a/Shorewall/Perl/Shorewall/Chains.pm
+++ b/Shorewall/Perl/Shorewall/Chains.pm
@@ -8148,7 +8148,8 @@ sub create_save_ipsets() {
 	}
     } elsif ( $config{SAVE_IPSETS} ) {
 	emit( '    error_message "WARNING: No ipsets were saved"',
-	      '    return 1',
+	      "    #\n    # Indicate success so that the CLI doesn't attempt to save the sets\n    #",
+	      '    return 0',
 	      "}\n" );
     } else {
 	emit( '    true',