diff --git a/FedoraUpdateRestart.pm b/FedoraUpdateRestart.pm
index 710ef84..31f9c25 100644
--- a/FedoraUpdateRestart.pm
+++ b/FedoraUpdateRestart.pm
@@ -42,7 +42,7 @@ sub on_job_done {
     my $jobid = $event_data->{id};
     OpenQA::Utils::log_debug("Update restarter considering job $jobid");
     my $job = $schema->resultset('Jobs')->find({id => $jobid});
-    my @jobmodules = OpenQA::Schema::Result::JobModules::job_modules($job);
+    my @jobmodules = $job->modules_with_job_prefetched->all;
     my $firstmodule = $jobmodules[0];
     my $clone_of = $schema->resultset("Jobs")->find({clone_id => $jobid});
     my $restart = "";
diff --git a/openqa.spec b/openqa.spec
index a255c6b..2b3b196 100644
--- a/openqa.spec
+++ b/openqa.spec
@@ -86,7 +86,7 @@
 
 Name:           openqa
 Version:        %{github_version}
-Release:        53%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
+Release:        54%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
 Summary:        OS-level automated testing framework
 License:        GPLv2+
 Url:            http://os-autoinst.github.io/openQA/
@@ -629,6 +629,9 @@ fi
 %{_datadir}/openqa/lib/OpenQA/WebAPI/Plugin/FedoraUpdateRestart.pm
 
 %changelog
+* Fri Aug 07 2020 Adam Williamson <awilliam@redhat.com> - 4.6-54.20200805gite9b4474
+- Fix FedoraUpdateRestart plugin for upstream code change
+
 * Wed Aug 05 2020 Adam Williamson <awilliam@redhat.com> - 4.6-53.20200805gite9b4474
 - Bump to latest git, re-sync spec with upstream