diff --git a/image_manager.cpp b/image_manager.cpp
index 206722c..6f49f5d 100644
--- a/image_manager.cpp
+++ b/image_manager.cpp
@@ -160,14 +160,22 @@
     // Create Version object
     auto objPath =  std::string{SOFTWARE_OBJPATH} + '/' + id;
 
-    this->versions.insert(std::make_pair(
-                                  id,
-                                  std::make_unique<Version>(
-                                          this->bus,
-                                          objPath,
-                                          version,
-                                          purpose,
-                                          imageDirPath.string())));
+    if (versions.find(id) == versions.end())
+    {
+        this->versions.insert(std::make_pair(
+                                      id,
+                                      std::make_unique<Version>(
+                                              this->bus,
+                                              objPath,
+                                              version,
+                                              purpose,
+                                              imageDirPath.string())));
+    }
+    else
+    {
+        log<level::INFO>("Software Object with the same version already exists",
+                         entry("VERSION_ID=%s", id));
+    }
 
     return 0;
 }
diff --git a/item_updater.cpp b/item_updater.cpp
index 490567c..2c23b93 100644
--- a/item_updater.cpp
+++ b/item_updater.cpp
@@ -137,11 +137,6 @@
                                 purpose,
                                 filePath)));
     }
-    else
-    {
-        log<level::INFO>("Software Object with the same version already exists",
-                         entry("VERSION_ID=%s", versionId));
-    }
     return;
 }