diff --git a/command/format_state.go b/command/format_state.go
index ccfd6573d6fd..9076af79ec3d 100644
--- a/command/format_state.go
+++ b/command/format_state.go
@@ -61,7 +61,17 @@ func FormatState(opts *FormatStateOpts) string {
 		// Output each output k/v pair
 		for _, k := range ks {
 			v := m.Outputs[k]
-			buf.WriteString(fmt.Sprintf("%s = %s\n", k, v))
+			switch output := v.Value.(type) {
+			case string:
+				buf.WriteString(fmt.Sprintf("%s = %s", k, output))
+				buf.WriteString("\n")
+			case []interface{}:
+				buf.WriteString(formatListOutput("", k, output))
+				buf.WriteString("\n")
+			case map[string]interface{}:
+				buf.WriteString(formatMapOutput("", k, output))
+				buf.WriteString("\n")
+			}
 		}
 	}