diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm
index 874874648..5e047901e 100644
--- a/Shorewall/Perl/Shorewall/Chains.pm
+++ b/Shorewall/Perl/Shorewall/Chains.pm
@@ -8159,7 +8159,6 @@ EOF
 	emit( qq(if [ "\$COMMAND" = stop -o "\$COMMAND" = clear ]; then),
 	      qq(    if chain_exists dynamic; then),
 	      qq(        $tool -S dynamic | tail -n +2 > \${VARDIR}/.dynamic) );
-	emit( '' ), save_docker_rules( $tool ) if $config{DOCKER};
     } else {
 	emit( qq(if [ "\$COMMAND" = stop -o "\$COMMAND" = clear ]; then),
 	      qq(    if chain_exists dynamic; then),
@@ -8168,9 +8167,15 @@ EOF
 
 emit <<"EOF";
     fi
+EOF
+
+emit <<"EOF";
+
 fi
 EOF
 
+    emit( '' ), save_docker_rules( $tool ) if $config{DOCKER};
+
     pop_indent;
 
     emit ( 'fi' ,