diff --git a/aws/resource_aws_kinesis_firehose_delivery_stream.go b/aws/resource_aws_kinesis_firehose_delivery_stream.go
index 90dbd80f3ec..c32bdba849a 100644
--- a/aws/resource_aws_kinesis_firehose_delivery_stream.go
+++ b/aws/resource_aws_kinesis_firehose_delivery_stream.go
@@ -176,7 +176,7 @@ func cloudwatchLoggingOptionsHash(v interface{}) int {
 
 func flattenCloudwatchLoggingOptions(clo *firehose.CloudWatchLoggingOptions) *schema.Set {
 	if clo == nil {
-		return nil
+		return schema.NewSet(cloudwatchLoggingOptionsHash, []interface{}{})
 	}
 
 	cloudwatchLoggingOptions := map[string]interface{}{