diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index f8184b135..0d5b56a7e 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -135,6 +135,10 @@
                     <release-item>
                         <p>Fixed an invalid log call in lock routines.</p>
                     </release-item>
+
+                    <release-item>
+                        <p>Fixed a issue where a remote could try to start its own remote.</p>
+                    </release-item>
                 </release-bug-list>
 
                 <release-feature-list>
diff --git a/lib/pgBackRest/Config/Config.pm b/lib/pgBackRest/Config/Config.pm
index 382b42bc4..964baa26e 100644
--- a/lib/pgBackRest/Config/Config.pm
+++ b/lib/pgBackRest/Config/Config.pm
@@ -2487,7 +2487,7 @@ sub protocolGet
     my $iProcessIdx = shift;
 
     # If force local or remote = NONE then create a local remote and return it
-    if ((defined($bForceLocal) && $bForceLocal) || optionRemoteTypeTest(NONE))
+    if ((defined($bForceLocal) && $bForceLocal) || optionRemoteTypeTest(NONE) || commandTest(CMD_REMOTE))
     {
         return new pgBackRest::Protocol::Common
         (