diff --git a/src/main/java/dev/openfeature/sdk/ProviderRepository.java b/src/main/java/dev/openfeature/sdk/ProviderRepository.java
index b7d570498..80bce33ab 100644
--- a/src/main/java/dev/openfeature/sdk/ProviderRepository.java
+++ b/src/main/java/dev/openfeature/sdk/ProviderRepository.java
@@ -135,14 +135,15 @@ private void initializeProvider(FeatureProvider newProvider,
     }
 
     private void shutDownOld(FeatureProvider oldProvider,Consumer<FeatureProvider> afterShutdown) {
-        if (!isProviderRegistered(oldProvider)) {
+        if (oldProvider != null && !isProviderRegistered(oldProvider)) {
             shutdownProvider(oldProvider);
             afterShutdown.accept(oldProvider);
         }
     }
 
     private boolean isProviderRegistered(FeatureProvider oldProvider) {
-        return this.providers.containsValue(oldProvider) || this.defaultProvider.get().equals(oldProvider);
+        return oldProvider != null && (this.providers.containsValue(oldProvider)
+            || this.defaultProvider.get().equals(oldProvider));
     }
 
     private void shutdownProvider(FeatureProvider provider) {