diff --git a/azure/table_azure_storage_account.go b/azure/table_azure_storage_account.go
index b656b04e..4bc9408f 100644
--- a/azure/table_azure_storage_account.go
+++ b/azure/table_azure_storage_account.go
@@ -535,6 +535,11 @@ func getAzureStorageAccountLifecycleManagementPolicy(ctx context.Context, d *plu
 func getAzureStorageAccountBlobProperties(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) {
 	accountData := h.Item.(*storageAccountInfo)
 
+	// Blob is not supported for the account if storage type is FileStorage
+	if accountData.Account.Kind == "FileStorage" {
+		return nil, nil
+	}
+
 	session, err := GetNewSession(ctx, d, "MANAGEMENT")
 	if err != nil {
 		return nil, err
@@ -593,6 +598,11 @@ func listAzureStorageAccountEncryptionScope(ctx context.Context, d *plugin.Query
 func getAzureStorageAccountBlobServiceLogging(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) {
 	accountData := h.Item.(*storageAccountInfo)
 
+	// Blob is not supported for the account if storage type is FileStorage
+	if accountData.Account.Kind == "FileStorage" {
+		return nil, nil
+	}
+
 	// Create session
 	session, err := GetNewSession(ctx, d, "MANAGEMENT")
 	if err != nil {
diff --git a/azure/table_azure_storage_blob_service.go b/azure/table_azure_storage_blob_service.go
index b59ab9b3..a9e49b10 100644
--- a/azure/table_azure_storage_blob_service.go
+++ b/azure/table_azure_storage_blob_service.go
@@ -162,6 +162,11 @@ func listStorageBlobServices(ctx context.Context, d *plugin.QueryData, h *plugin
 	// Get the details of storage account
 	account := h.Item.(*storageAccountInfo)
 
+	// Blob is not supported for the account if storage type is FileStorage
+	if account.Account.Kind == "FileStorage" {
+		return nil, nil
+	}
+
 	session, err := GetNewSession(ctx, d, "MANAGEMENT")
 	if err != nil {
 		return nil, err
diff --git a/azure/table_azure_storage_container.go b/azure/table_azure_storage_container.go
index f14499e2..71ba5b4f 100644
--- a/azure/table_azure_storage_container.go
+++ b/azure/table_azure_storage_container.go
@@ -185,6 +185,11 @@ func listStorageContainers(ctx context.Context, d *plugin.QueryData, h *plugin.H
 	// Get the details of storage account
 	account := h.Item.(*storageAccountInfo)
 
+	// Blob is not supported for the account if storage type is FileStorage
+	if account.Account.Kind == "FileStorage" {
+		return nil, nil
+	}
+
 	// Create session
 	session, err := GetNewSession(ctx, d, "MANAGEMENT")
 	if err != nil {
diff --git a/azure/table_azure_storage_queue.go b/azure/table_azure_storage_queue.go
index 8869fedf..2f9bfe32 100644
--- a/azure/table_azure_storage_queue.go
+++ b/azure/table_azure_storage_queue.go
@@ -105,6 +105,11 @@ func listStorageQueues(ctx context.Context, d *plugin.QueryData, h *plugin.Hydra
 	// Get the details of storage account
 	account := h.Item.(*storageAccountInfo)
 
+	// Queue is not supported for the account if storage type is FileStorage
+	if account.Account.Kind == "FileStorage" {
+		return nil, nil
+	}
+
 	session, err := GetNewSession(ctx, d, "MANAGEMENT")
 	if err != nil {
 		return nil, err
diff --git a/azure/table_azure_storage_table.go b/azure/table_azure_storage_table.go
index 8648f700..1a65090a 100644
--- a/azure/table_azure_storage_table.go
+++ b/azure/table_azure_storage_table.go
@@ -99,6 +99,11 @@ func listStorageTables(ctx context.Context, d *plugin.QueryData, h *plugin.Hydra
 	// Get the details of storage account
 	account := h.Item.(*storageAccountInfo)
 
+	// Table is not supported for the account if storage type is FileStorage
+	if account.Account.Kind == "FileStorage" {
+		return nil, nil
+	}
+
 	session, err := GetNewSession(ctx, d, "MANAGEMENT")
 	if err != nil {
 		return nil, err
diff --git a/azure/table_azure_storage_table_service.go b/azure/table_azure_storage_table_service.go
index d8518126..11515930 100644
--- a/azure/table_azure_storage_table_service.go
+++ b/azure/table_azure_storage_table_service.go
@@ -105,6 +105,11 @@ func listStorageTableServices(ctx context.Context, d *plugin.QueryData, h *plugi
 	// Get the details of storage account
 	account := h.Item.(*storageAccountInfo)
 
+	// Table is not supported for the account if storage type is FileStorage
+	if account.Account.Kind == "FileStorage" {
+		return nil, nil
+	}
+
 	session, err := GetNewSession(ctx, d, "MANAGEMENT")
 	if err != nil {
 		return nil, err