diff --git a/firmware_handler.cpp b/firmware_handler.cpp
index 9b4e7b0..fc4438e 100644
--- a/firmware_handler.cpp
+++ b/firmware_handler.cpp
@@ -231,22 +231,19 @@
      * above we verify they selected at least one we wanted.
      */
     Session* curr;
+    const std::string* active;
 
     if (path == hashBlobID)
     {
         /* 2c) are they opening the /flash/hash ? (to start the process) */
 
         curr = &activeHash;
-
-        /* Add active hash blob_id to canHandle list. */
-        blobIDs.push_back(activeHashBlobID);
+        active = &activeHashBlobID;
     }
     else
     {
         curr = &activeImage;
-
-        /* add active image blob_id to canHandle list. */
-        blobIDs.push_back(activeImageBlobID);
+        active = &activeImageBlobID;
     }
 
     /* 2d) are they opening the /flash/tarball ? (to start the UBI process)
@@ -274,6 +271,8 @@
 
     lookup[session] = curr;
 
+    blobIDs.push_back(*active);
+
     return true;
 }
 
diff --git a/test/firmware_open_unittest.cpp b/test/firmware_open_unittest.cpp
index 317911c..967f792 100644
--- a/test/firmware_open_unittest.cpp
+++ b/test/firmware_open_unittest.cpp
@@ -126,6 +126,10 @@
 
     EXPECT_FALSE(handler->open(
         0, OpenFlags::write | FirmwareBlobHandler::UpdateFlags::ipmi, "asdf"));
+
+    /* Verify blob_id list doesn't grow. */
+    auto currentBlobs = handler->getBlobIds();
+    EXPECT_EQ(2, currentBlobs.size());
 }
 
 TEST(FirmwareHandlerOpenTest, OpenWithoutWriteFails)