diff --git a/builtin/providers/heroku/resource_heroku_app.go b/builtin/providers/heroku/resource_heroku_app.go
index fd59bd7d1..368adad5a 100644
--- a/builtin/providers/heroku/resource_heroku_app.go
+++ b/builtin/providers/heroku/resource_heroku_app.go
@@ -104,8 +104,7 @@ func resourceHerokuApp() *schema.Resource {
 }
 
 func switchHerokuAppCreate(d *schema.ResourceData, meta interface{}) error {
-	isOrg := d.Get("organization")
-	if len(isOrg.(string)) != 0 {
+	if _, ok := d.GetOk("organization"); ok {
 		return resourceHerokuOrgAppCreate(d, meta)
 	} else {
 		return resourceHerokuAppCreate(d, meta)