diff --git a/src/lib/Hydra/Plugin/RunCommand.pm b/src/lib/Hydra/Plugin/RunCommand.pm
index 92acc326..8d3cf35a 100644
--- a/src/lib/Hydra/Plugin/RunCommand.pm
+++ b/src/lib/Hydra/Plugin/RunCommand.pm
@@ -37,6 +37,16 @@ sub areDynamicCommandsEnabled {
     return 0;
 }
 
+sub isBuildEligibleForDynamicRunCommand {
+    my ($build) = @_;
+
+    if ($build->get_column("job") =~ "^runCommandHook\..+") {
+        return 1;
+    }
+
+    return 0;
+}
+
 sub configSectionMatches {
     my ($name, $project, $jobset, $job) = @_;
 
@@ -102,9 +112,8 @@ sub fanoutToCommands {
         # 2. what if the result is a directory?
         # 3. what if the job doens't have an out?
         # 4. what if the build failed?
-        my $job = $build->get_column('job');
-
-        if ($job =~ "^runCommandHook\.") {
+        if (isBuildEligibleForDynamicRunCommand($build)) {
+            my $job = $build->get_column('job');
             my $out = $build->buildoutputs->find({name => "out"});
             push(@commands, {
                 matcher => "DynamicRunCommand($job)",
diff --git a/t/Hydra/Plugin/RunCommand/fanout.t b/t/Hydra/Plugin/RunCommand/fanout.t
index d3a7b98a..2edcb390 100644
--- a/t/Hydra/Plugin/RunCommand/fanout.t
+++ b/t/Hydra/Plugin/RunCommand/fanout.t
@@ -105,4 +105,38 @@ subtest "fanoutToCommandsWithDynamicRunCommandSupport" => sub {
     );
 };
 
+subtest "isBuildEligibleForDynamicRunCommand" => sub {
+    my $build = Hydra::Schema::Result::Builds->new({
+        "job" => "foo bar baz"
+    });
+
+    is(
+        Hydra::Plugin::RunCommand::isBuildEligibleForDynamicRunCommand($build),
+        0,
+        "The job name does not match"
+    );
+
+    $build->set_column("job", "runCommandHook");
+    is(
+        Hydra::Plugin::RunCommand::isBuildEligibleForDynamicRunCommand($build),
+        0,
+        "The job name does not match"
+    );
+
+    $build->set_column("job", "runCommandHook.");
+    is(
+        Hydra::Plugin::RunCommand::isBuildEligibleForDynamicRunCommand($build),
+        0,
+        "The job name does not match"
+    );
+
+    $build->set_column("job", "runCommandHook.a");
+    is(
+        Hydra::Plugin::RunCommand::isBuildEligibleForDynamicRunCommand($build),
+        1,
+        "The job name does match"
+    );
+};
+
+
 done_testing;