diff --git a/ribbon-core/src/main/java/com/netflix/client/config/ReloadableClientConfig.java b/ribbon-core/src/main/java/com/netflix/client/config/ReloadableClientConfig.java
index e53ecd82..ac302f29 100644
--- a/ribbon-core/src/main/java/com/netflix/client/config/ReloadableClientConfig.java
+++ b/ribbon-core/src/main/java/com/netflix/client/config/ReloadableClientConfig.java
@@ -309,7 +309,11 @@ private <T> Optional<T> resolverScopedProperty(IClientConfigKey<T> key) {
 
     @Override
     public <T> Optional<T> getIfSet(IClientConfigKey<T> key) {
-        return Optional.ofNullable((T)internalProperties.get(key));
+        Optional<T> value = (Optional<T>)internalProperties.get(key);
+        if (value == null) {
+            return Optional.empty();
+        }
+        return value;
     }
 
     private <T> T resolveValueToType(IClientConfigKey<T> key, Object value) {