diff --git a/pom.xml b/pom.xml
index 52b2f18..9488e9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.airbnb.billow</groupId>
     <artifactId>billow</artifactId>
-    <version>2.21</version>
+    <version>2.25</version>
 
     <licenses>
         <license>
diff --git a/src/main/java/com/airbnb/billow/ElasticsearchCluster.java b/src/main/java/com/airbnb/billow/ElasticsearchCluster.java
index 47c2d1a..7368dea 100644
--- a/src/main/java/com/airbnb/billow/ElasticsearchCluster.java
+++ b/src/main/java/com/airbnb/billow/ElasticsearchCluster.java
@@ -45,7 +45,12 @@ public ElasticsearchCluster(ElasticsearchDomainStatus domainStatus, List<Tag> ta
     this.instanceCount = esConfig.getInstanceCount();
     this.dedicatedMasterEnabled = esConfig.getDedicatedMasterEnabled();
     this.zoneAwarenessEnabled = esConfig.getZoneAwarenessEnabled();
-    this.dedicatedMasterType = esConfig.getDedicatedMasterType();
-    this.dedicatedMasterCount = esConfig.getDedicatedMasterCount();
+    if (esConfig.getDedicatedMasterEnabled()) {
+      this.dedicatedMasterCount = esConfig.getDedicatedMasterCount();
+      this.dedicatedMasterType = esConfig.getDedicatedMasterType();
+    } else {
+      this.dedicatedMasterCount = 0;
+      this.dedicatedMasterType = "";
+    }
   }
 }