diff --git a/helper/schema/field_reader.go b/helper/schema/field_reader.go
index 2046581b7e..a2adb0ce6c 100644
--- a/helper/schema/field_reader.go
+++ b/helper/schema/field_reader.go
@@ -42,8 +42,8 @@ func (r *FieldReadResult) ValueOrZero(s *Schema) interface{} {
 
 	// The zero value of a set is nil, but we want it
 	// to actually be an empty set object...
-	if s.Type == TypeSet && result == nil {
-		result = &Set{F: s.Set}
+	if set, ok := result.(*Set); ok && set.F == nil {
+		set.F = s.Set
 	}
 
 	return result