diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfig.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfig.java
index 02a3c8dd78..44a3b0a7bd 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfig.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfig.java
@@ -93,6 +93,12 @@ public ResourceDiscriminator getResourceDiscriminator() {
   public void changeNamespaces(Set<String> namespaces) {
     if (!wereNamespacesConfigured()) {
       this.namespacesWereConfigured = true;
+      setNamespaces(namespaces);
+    }
+  }
+
+  protected void setNamespaces(Set<String> namespaces) {
+    if (namespaces != null && !namespaces.isEmpty()) {
       this.namespaces = namespaces;
     }
   }