diff --git a/azurerm/data_source_client_config.go b/azurerm/data_source_client_config.go
index 9477877dda0a..de2dffc32cc5 100644
--- a/azurerm/data_source_client_config.go
+++ b/azurerm/data_source_client_config.go
@@ -90,11 +90,17 @@ func dataSourceArmClientConfigRead(d *schema.ResourceData, meta interface{}) err
 	}
 
 	d.Set("object_id", "")
-	if v, err := client.getAuthenticatedObjectID(ctx); err != nil {
-		return fmt.Errorf("Error getting authenticated object ID: %v", err)
-	} else {
-		d.Set("object_id", v)
+
+	// TODO remove this when we confirm that MSI no longer returns nil with getAuthenticatedObjectID
+	objectId := ""
+	if client.getAuthenticatedObjectID != nil {
+		v, err := client.getAuthenticatedObjectID(ctx)
+		if err != nil {
+			return fmt.Errorf("Error getting authenticated object ID: %v", err)
+		}
+		objectId = v
 	}
+	d.Set("object_id", objectId)
 
 	return nil
 }