diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js b/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
index d8a4f1e7d..1e924405c 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
@@ -789,7 +789,11 @@ RED.utils = (function() {
                 return RED.settings.apiRootUrl+"icons/"+iconPath.module+"/"+iconPath.file;
             }
         } else {
-            if (def.category === 'subflows') {
+            // This could be a non-core node trying to use a core icon.
+            iconPath.module = 'node-red';
+            if (isIconExists(iconPath)) {
+                return RED.settings.apiRootUrl+"icons/"+iconPath.module+"/"+iconPath.file;
+            } else if (def.category === 'subflows') {
                 return RED.settings.apiRootUrl+"icons/node-red/subflow.png";
             } else {
                 return RED.settings.apiRootUrl+"icons/node-red/arrow-in.png";