diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp
index 1d0e4b2cc9e..b1b5aad07c6 100644
--- a/src/plugins/vcsbase/vcsbaseclient.cpp
+++ b/src/plugins/vcsbase/vcsbaseclient.cpp
@@ -170,7 +170,8 @@ void VcsBaseClientImpl::vcsExecWithHandler(const FilePath &workingDirectory,
     command->addFlags(additionalFlags);
     command->addJob({vcsBinary(), arguments}, vcsTimeoutS());
     if (handler) {
-        connect(command, &VcsCommand::done, context, [command, handler] {
+        const QObject *actualContext = context ? context : this;
+        connect(command, &VcsCommand::done, actualContext, [command, handler] {
             handler(CommandResult(*command));
         });
     }