diff --git a/pmd/etc/changelog.txt b/pmd/etc/changelog.txt
index 20926fe096..89d7d7d66e 100644
--- a/pmd/etc/changelog.txt
+++ b/pmd/etc/changelog.txt
@@ -414,6 +414,7 @@ Fixed bug 2230809 - False +: ClassWithOnlyPrivateConstructorsShouldBeFinal
 Fixed bug 2338341 - ArrayIndexOutOfBoundsException in CPD (on Ruby)
 Fixed bug 2315599 - False +: UseSingleton with class containing constructor
 Fixed bug 1955852 - false positives for UnusedPrivateMethod & UnusedLocalVariable
+Fixed bug 2404700 - UseSingleton should not act on enums
 
 ruleset.dtd and ruleset_xml_schema.xsd added to jar file in rulesets directory
 bin and java14/bin scripts:
diff --git a/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UseSingleton.xml b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UseSingleton.xml
index d2343cc1e6..b04c300e1e 100644
--- a/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UseSingleton.xml
+++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/design/xml/UseSingleton.xml
@@ -134,6 +134,36 @@ public class UseSingleton extends Exception {
 }
 			   ]]></code>
     </test-code>    
-    
-    
+    <test-code>
+        <description><![CDATA[
+inner should be singleton since all static, public constructor
+     ]]></description>
+        <expected-problems>1</expected-problems>
+        <code><![CDATA[
+public class Foo {
+ static class Bar {
+   public Bar() { }
+   public static void doSomething() {}
+ }
+ public void doSomething() {}
+}
+     ]]></code>
+    </test-code>
+    <test-code>
+        <description><![CDATA[
+[ 2404700 ] UseSingleton should not act on enums
+     ]]></description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+public enum EnumTest {
+	A, B;
+
+	EnumTest() { }
+
+	public static void main(String[] args) {
+		System.out.println(EnumTest.A);
+	}
+}
+     ]]></code>
+    </test-code>
 </test-data>
diff --git a/pmd/src/net/sourceforge/pmd/lang/java/rule/design/UseSingletonRule.java b/pmd/src/net/sourceforge/pmd/lang/java/rule/design/UseSingletonRule.java
index f1fcaaf0cb..0543353488 100644
--- a/pmd/src/net/sourceforge/pmd/lang/java/rule/design/UseSingletonRule.java
+++ b/pmd/src/net/sourceforge/pmd/lang/java/rule/design/UseSingletonRule.java
@@ -3,9 +3,10 @@
  */
 package net.sourceforge.pmd.lang.java.rule.design;
 
+import net.sourceforge.pmd.lang.ast.Node;
+import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceBody;
 import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType;
-import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit;
 import net.sourceforge.pmd.lang.java.ast.ASTConstructorDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTFieldDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration;
@@ -14,64 +15,55 @@ import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
 
 public class UseSingletonRule extends AbstractJavaRule {
 
-    private boolean isOK;
-    private int methodCount;
-
     @Override
-    public Object visit(ASTCompilationUnit cu, Object data) {
-        methodCount = 0;
-        isOK = false;
-        Object result = cu.childrenAccept(this, data);
-        if (!isOK && methodCount > 0) {
-            addViolation(data, cu);
-        }
+    public Object visit(ASTClassOrInterfaceBody decl, Object data) {
+        if (decl.jjtGetParent() instanceof ASTClassOrInterfaceDeclaration) {
+            ASTClassOrInterfaceDeclaration parent = (ASTClassOrInterfaceDeclaration) decl.jjtGetParent();
+            if (parent.isAbstract() || parent.isInterface()) {
+                return super.visit(decl, data);
+            }
+            int i = decl.jjtGetNumChildren();
+            int methodCount = 0;
+            boolean isOK = false;
+            while (i > 0) {
+                Node n = decl.jjtGetChild(--i).jjtGetChild(0);
+                if (n instanceof ASTFieldDeclaration) {
+                    if (!((ASTFieldDeclaration) n).isStatic()) {
+                        isOK = true;
+                        break;
+                    }
+                } else if (n instanceof ASTConstructorDeclaration) {
+                    if (((ASTConstructorDeclaration) n).isPrivate()) {
+                        isOK = true;
+                        break;
+                    }
+                } else if (n instanceof ASTMethodDeclaration) {
+                    ASTMethodDeclaration m = (ASTMethodDeclaration) n;
+                    if (!m.isPrivate()) {
+                        methodCount++;
+                    }
+                    if (!m.isStatic()) {
+                        isOK = true;
+                        break;
+                    }
 
-        return result;
-    }
+                    // TODO use symbol table
+                    if (m.getMethodName().equals("suite")) {
+                        ASTResultType res = m.getResultType();
+                        ASTClassOrInterfaceType c = res.getFirstDescendantOfType(ASTClassOrInterfaceType.class);
+                        if (c != null && c.hasImageEqualTo("Test")) {
+                            isOK = true;
+                            break;
+                        }
+                    }
 
-    @Override
-    public Object visit(ASTFieldDeclaration decl, Object data) {
-        if (!decl.isStatic()) {
-            isOK = true;
-        }
-        return data;
-    }
-
-    @Override
-    public Object visit(ASTConstructorDeclaration decl, Object data) {
-        if (decl.isPrivate()) {
-            isOK = true;
-        }
-        return data;
-    }
-
-    @Override
-    public Object visit(ASTClassOrInterfaceDeclaration decl, Object data) {
-        if (decl.isAbstract()) {
-            isOK = true;
+                }
+            }
+            if (!isOK && methodCount > 0) {
+                addViolation(data, decl);
+            }
         }
         return super.visit(decl, data);
     }
 
-    @Override
-    public Object visit(ASTMethodDeclaration decl, Object data) {
-        if ( !  decl.isPrivate()) {
-		methodCount++;
-	}
-        if (!isOK && !decl.isStatic()) {
-            isOK = true;
-        }
-
-        // TODO use symbol table
-        if (decl.getMethodName().equals("suite")) {
-            ASTResultType res = decl.getResultType();
-            ASTClassOrInterfaceType c = res.getFirstDescendantOfType(ASTClassOrInterfaceType.class);
-            if (c != null && c.hasImageEqualTo("Test")) {
-                isOK = true;
-            }
-        }
-
-        return data;
-    }
-
 }