diff --git a/source/MaterialXCore/Version.cpp b/source/MaterialXCore/Version.cpp
index 34d9b3b02c..62f83a5660 100644
--- a/source/MaterialXCore/Version.cpp
+++ b/source/MaterialXCore/Version.cpp
@@ -1317,7 +1317,13 @@ void Document::upgradeVersion()
             else if (nodeCategory == "normalmap")
             {
                 // ND_normalmap was renamed to ND_normalmap_float
-                node->setNodeDefString("ND_normalmap_float");
+                NodeDefPtr nodeDef = getShaderNodeDef(node);
+                InputPtr scaleInput = node->getInput("scale");
+                if ((nodeDef && nodeDef->getName() == "ND_normalmap") ||
+                    (scaleInput && scaleInput->getType() == "float"))
+                {
+                    node->setNodeDefString("ND_normalmap_float");
+                }
 
                 node->removeInput("space");