diff --git a/activation.cpp b/activation.cpp
index 11c7b32..e807d04 100755
--- a/activation.cpp
+++ b/activation.cpp
@@ -4,6 +4,7 @@
 #include "item_updater.hpp"
 #include "serialize.hpp"
 #include <phosphor-logging/log.hpp>
+#include <sdbusplus/exception.hpp>
 
 #ifdef WANT_SIGNATURE_VERIFY
 #include <sdbusplus/server.hpp>
@@ -24,6 +25,7 @@
 namespace softwareServer = sdbusplus::xyz::openbmc_project::Software::server;
 
 using namespace phosphor::logging;
+using sdbusplus::exception::SdBusError;
 
 #ifdef WANT_SIGNATURE_VERIFY
 using InternalFailure =
@@ -41,8 +43,25 @@
 {
     auto method = this->bus.new_method_call(SYSTEMD_SERVICE, SYSTEMD_OBJ_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;
 }
 
@@ -122,6 +141,8 @@
 
         if (ubiVolumesCreated == false)
         {
+            // Enable systemd signals
+            Activation::subscribeToSystemdSignals();
 
 #ifdef WANT_SIGNATURE_VERIFY
             // Validate the signed image.
diff --git a/activation.hpp b/activation.hpp
index 1a600cc..98646e5 100755
--- a/activation.hpp
+++ b/activation.hpp
@@ -193,8 +193,6 @@
             std::bind(std::mem_fn(&Activation::unitStateChange), this,
                       std::placeholders::_1))
     {
-        // Enable systemd signals
-        subscribeToSystemdSignals();
         // Set Properties.
         extendedVersion(extVersion);
         activation(activationStatus);