diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8f763ac..08c052ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ FlatLaf Change Log
 
 - Custom window decorations: Embedded menu bar did not always respond to mouse
   events after adding menus and when running in JetBrains Runtime. (issue #151)
+- IntelliJ Themes: Fixed NPE in Solarized themes on scroll bar hover.
 
 
 ## 0.39
diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java
index df08b677..10aac83c 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java
@@ -263,6 +263,9 @@ public class IntelliJTheme
 			for( Map.Entry<String, Object> e : ((Map<String, Object>)value).entrySet() )
 				apply( key + '.' + e.getKey(), e.getValue(), defaults, defaultsKeysCache, uiKeys );
 		} else {
+			if( "".equals( value ) )
+				return; // ignore empty value
+
 			uiKeys.add( key );
 
 			// fix ComboBox size and Spinner border in all Material UI Lite themes