diff --git a/gerrit-server/src/main/prolog/gerrit_common.pl b/gerrit-server/src/main/prolog/gerrit_common.pl
index 5342b8466b..1c441ab3a2 100644
--- a/gerrit-server/src/main/prolog/gerrit_common.pl
+++ b/gerrit-server/src/main/prolog/gerrit_common.pl
@@ -198,8 +198,8 @@ default_submit([Type | Types], Tmp, Out) :-
 %%
 legacy_submit_rule('MaxWithBlock', Label, Id, Min, Max, T) :- !, max_with_block(Label, Min, Max, T).
 legacy_submit_rule('MaxNoBlock', Label, Id, Min, Max, T) :- !, max_no_block(Label, Max, T).
-legacy_submit_rule('NoBlock', Label, Id, Min, Max, T) :- true.
-legacy_submit_rule('NoOp', Label, Id, Min, Max, T) :- true.
+legacy_submit_rule('NoBlock', Label, Id, Min, Max, T) :- T = ok, true.
+legacy_submit_rule('NoOp', Label, Id, Min, Max, T) :- T = ok, true.
 legacy_submit_rule(Fun, Label, Id, Min, Max, T) :- T = impossible(unsupported(Fun)).