diff --git a/ibm/service/vpc/data_source_ibm_is_bare_metal_server.go b/ibm/service/vpc/data_source_ibm_is_bare_metal_server.go
index 52ebee951cc..949e7308494 100644
--- a/ibm/service/vpc/data_source_ibm_is_bare_metal_server.go
+++ b/ibm/service/vpc/data_source_ibm_is_bare_metal_server.go
@@ -470,9 +470,11 @@ func dataSourceIBMISBareMetalServerRead(context context.Context, d *schema.Resou
 
 	d.SetId(*bms.ID)
 	d.Set(isBareMetalServerBandwidth, bms.Bandwidth)
-	bmsBootTargetIntf := bms.BootTarget.(*vpcv1.BareMetalServerBootTarget)
-	bmsBootTarget := bmsBootTargetIntf.ID
-	d.Set(isBareMetalServerBootTarget, bmsBootTarget)
+	if bms.BootTarget != nil {
+		bmsBootTargetIntf := bms.BootTarget.(*vpcv1.BareMetalServerBootTarget)
+		bmsBootTarget := bmsBootTargetIntf.ID
+		d.Set(isBareMetalServerBootTarget, bmsBootTarget)
+	}
 
 	// set keys and image using initialization
 
diff --git a/ibm/service/vpc/data_source_ibm_is_bare_metal_servers.go b/ibm/service/vpc/data_source_ibm_is_bare_metal_servers.go
index d3ad3b6409d..aa4c12f339e 100644
--- a/ibm/service/vpc/data_source_ibm_is_bare_metal_servers.go
+++ b/ibm/service/vpc/data_source_ibm_is_bare_metal_servers.go
@@ -521,9 +521,11 @@ func dataSourceIBMISBareMetalServersRead(context context.Context, d *schema.Reso
 		}
 		l["id"] = *bms.ID
 		l[isBareMetalServerBandwidth] = *bms.Bandwidth
-		bmsBootTargetIntf := bms.BootTarget.(*vpcv1.BareMetalServerBootTarget)
-		bmsBootTarget := bmsBootTargetIntf.ID
-		l[isBareMetalServerBootTarget] = bmsBootTarget
+		if bms.BootTarget != nil {
+			bmsBootTargetIntf := bms.BootTarget.(*vpcv1.BareMetalServerBootTarget)
+			bmsBootTarget := bmsBootTargetIntf.ID
+			l[isBareMetalServerBootTarget] = bmsBootTarget
+		}
 		cpuList := make([]map[string]interface{}, 0)
 		if bms.Cpu != nil {
 			currentCPU := map[string]interface{}{}