diff --git a/terraform/context.go b/terraform/context.go
index 5dd2d2f05..2f6ce15ee 100644
--- a/terraform/context.go
+++ b/terraform/context.go
@@ -1559,7 +1559,6 @@ func (c *walkContext) computeResourceMultiVariable(
 	// TODO: Not use only root module
 	module := c.Context.state.RootModule()
 
-	// TODO: handle computed here
 	count, err := cr.Count()
 	if err != nil {
 		return "", fmt.Errorf(
@@ -1568,6 +1567,11 @@ func (c *walkContext) computeResourceMultiVariable(
 			err)
 	}
 
+	// If we have no count, return empty
+	if count == 0 {
+		return "", nil
+	}
+
 	var values []string
 	for i := 0; i < count; i++ {
 		id := fmt.Sprintf("%s.%d", v.ResourceId(), i)
diff --git a/terraform/context_test.go b/terraform/context_test.go
index d44c499c2..599acef97 100644
--- a/terraform/context_test.go
+++ b/terraform/context_test.go
@@ -2490,6 +2490,29 @@ func TestContextPlan_countVar(t *testing.T) {
 	}
 }
 
+func TestContextPlan_countZero(t *testing.T) {
+	m := testModule(t, "plan-count-zero")
+	p := testProvider("aws")
+	p.DiffFn = testDiffFn
+	ctx := testContext(t, &ContextOpts{
+		Module: m,
+		Providers: map[string]ResourceProviderFactory{
+			"aws": testProviderFuncFixed(p),
+		},
+	})
+
+	plan, err := ctx.Plan(nil)
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	actual := strings.TrimSpace(plan.String())
+	expected := strings.TrimSpace(testTerraformPlanCountZeroStr)
+	if actual != expected {
+		t.Fatalf("bad:\n%s", actual)
+	}
+}
+
 func TestContextPlan_countDecreaseToOne(t *testing.T) {
 	m := testModule(t, "plan-count-dec")
 	p := testProvider("aws")
diff --git a/terraform/terraform_test.go b/terraform/terraform_test.go
index 350a2354d..f0c1096ce 100644
--- a/terraform/terraform_test.go
+++ b/terraform/terraform_test.go
@@ -477,6 +477,18 @@ STATE:
 <no state>
 `
 
+const testTerraformPlanCountZeroStr = `
+DIFF:
+
+CREATE: aws_instance.bar
+  foo:  "" => ""
+  type: "" => "aws_instance"
+
+STATE:
+
+<no state>
+`
+
 const testTerraformPlanCountVarStr = `
 DIFF:
 
diff --git a/terraform/test-fixtures/plan-count-zero/main.tf b/terraform/test-fixtures/plan-count-zero/main.tf
new file mode 100644
index 000000000..4845cbb0b
--- /dev/null
+++ b/terraform/test-fixtures/plan-count-zero/main.tf
@@ -0,0 +1,8 @@
+resource "aws_instance" "foo" {
+    count = 0
+    foo = "foo"
+}
+
+resource "aws_instance" "bar" {
+    foo = "${aws_instance.foo.*.foo}"
+}