diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
index eb72c17b..501d04f1 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
@@ -106,7 +106,7 @@ public abstract class FlatLaf
 
 	@Override
 	public Icon getDisabledIcon(JComponent component, Icon icon) {
-		return new IconUIResource(FlatUIUtils.getDisabledIcon(icon));
+		return ( icon == null ) ? null : new IconUIResource( FlatUIUtils.getDisabledIcon( icon ) );
 	}
 
 	@Override