diff --git a/activation.cpp b/activation.cpp
index b64f1be..92de6a6 100644
--- a/activation.cpp
+++ b/activation.cpp
@@ -3,6 +3,7 @@
 #include "config.h"
 #include "serialize.hpp"
 #include <phosphor-logging/log.hpp>
+#include <sdbusplus/exception.hpp>
 
 #ifdef WANT_SIGNATURE_VERIFY
 #include <phosphor-logging/elog.hpp>
@@ -21,6 +22,7 @@
 namespace softwareServer = sdbusplus::xyz::openbmc_project::Software::server;
 
 using namespace phosphor::logging;
+using sdbusplus::exception::SdBusError;
 
 #ifdef WANT_SIGNATURE_VERIFY
 using InternalFailure =
@@ -32,7 +34,25 @@
 {
     auto method = this->bus.new_method_call(SYSTEMD_BUSNAME, SYSTEMD_PATH,
                                             SYSTEMD_INTERFACE, "Subscribe");
-    this->bus.call_noreply(method);
+    try
+    {
+        this->bus.call_noreply(method);
+    }
+    catch (const SdBusError& e)
+    {
+        if (e.name() != nullptr &&
+            strcmp("org.freedesktop.systemd1.AlreadySubscribed", e.name()) == 0)
+        {
+            // If an Activation attempt fails, the Unsubscribe method is not
+            // called. This may lead to an AlreadySubscribed error if the
+            // Activation is re-attempted.
+        }
+        else
+        {
+            log<level::ERR>("Error subscribing to systemd",
+                            entry("ERROR=%s", e.what()));
+        }
+    }
 
     return;
 }
@@ -59,6 +79,9 @@
     {
         if (rwVolumeCreated == false && roVolumeCreated == false)
         {
+            // Enable systemd signals
+            Activation::subscribeToSystemdSignals();
+
             parent.freeSpace();
 
             if (!activationProgress)
diff --git a/activation.hpp b/activation.hpp
index 9315fc8..ba7c618 100644
--- a/activation.hpp
+++ b/activation.hpp
@@ -216,8 +216,6 @@
             std::bind(std::mem_fn(&Activation::unitStateChange), this,
                       std::placeholders::_1))
     {
-        // Enable systemd signals
-        subscribeToSystemdSignals();
         // Set Properties.
         activation(activationStatus);
         associations(assocs);