diff --git a/aws/resource_aws_ebs_volume.go b/aws/resource_aws_ebs_volume.go
index 1beda135e03..47714707e51 100644
--- a/aws/resource_aws_ebs_volume.go
+++ b/aws/resource_aws_ebs_volume.go
@@ -140,7 +140,7 @@ func resourceAwsEbsVolumeCreate(d *schema.ResourceData, meta interface{}) error
 		}
 	}
 
-	return readVolume(d, result)
+	return resourceAwsEbsVolumeRead(d, meta)
 }
 
 func resourceAWSEbsVolumeUpdate(d *schema.ResourceData, meta interface{}) error {
@@ -297,9 +297,7 @@ func readVolume(d *schema.ResourceData, volume *ec2.Volume) error {
 		}
 	}
 
-	if volume.Tags != nil {
-		d.Set("tags", tagsToMap(volume.Tags))
-	}
+	d.Set("tags", tagsToMap(volume.Tags))
 
 	return nil
 }