diff --git a/item_updater.cpp b/item_updater.cpp
index fcb7aca..f920661 100644
--- a/item_updater.cpp
+++ b/item_updater.cpp
@@ -536,8 +536,10 @@
         {
             count++;
             // Don't put the functional version on the queue since we can't
-            // remove the "running" PNOR version.
-            if (isVersionFunctional(iter.second->versionId))
+            // remove the "running" PNOR version if it allows multiple PNORs
+            // But removing functional version if there is only one PNOR.
+            if (ACTIVE_PNOR_MAX_ALLOWED > 1 &&
+                isVersionFunctional(iter.second->versionId))
             {
                 continue;
             }