diff --git a/server/stream.go b/server/stream.go
index 6f7d16a0..8e1dcd5a 100644
--- a/server/stream.go
+++ b/server/stream.go
@@ -409,6 +409,12 @@ func (a *Account) addStreamWithAssignment(config *StreamConfig, fsConfig *FileSt
 		jsa.mu.Unlock()
 		// Check to see if configs are same.
 		ocfg := mset.config()
+
+		// set the index name on cfg since it would not contain a value for iname while the return from mset.config() does to ensure the DeepEqual works
+		for _, s := range cfg.Sources {
+			s.setIndexName()
+		}
+
 		if reflect.DeepEqual(ocfg, cfg) {
 			if sa != nil {
 				mset.setStreamAssignment(sa)
@@ -449,20 +455,18 @@ func (a *Account) addStreamWithAssignment(config *StreamConfig, fsConfig *FileSt
 	}
 
 	// Setup our internal indexed names here for sources and check if the transform (if any) is valid.
-	if len(cfg.Sources) > 0 {
-		for _, ssi := range cfg.Sources {
-			ssi.setIndexName()
-			// check the filter, if any, is valid
-			if ssi.FilterSubject != _EMPTY_ && !IsValidSubject(ssi.FilterSubject) {
+
+	for _, ssi := range cfg.Sources {
+		// check the filter, if any, is valid
+		if ssi.FilterSubject != _EMPTY_ && !IsValidSubject(ssi.FilterSubject) {
+			jsa.mu.Unlock()
+			return nil, fmt.Errorf("subject filter '%s' for the source %w", ssi.FilterSubject, ErrBadSubject)
+		}
+		// check the transform, if any, is valid
+		if ssi.SubjectTransformDest != _EMPTY_ {
+			if _, err = NewSubjectTransform(ssi.FilterSubject, ssi.SubjectTransformDest); err != nil {
 				jsa.mu.Unlock()
-				return nil, fmt.Errorf("subject filter '%s' for the source %w", ssi.FilterSubject, ErrBadSubject)
-			}
-			// check the transform, if any, is valid
-			if ssi.SubjectTransformDest != _EMPTY_ {
-				if _, err = NewSubjectTransform(ssi.FilterSubject, ssi.SubjectTransformDest); err != nil {
-					jsa.mu.Unlock()
-					return nil, fmt.Errorf("subject transform from '%s' to '%s' for the source %w", ssi.FilterSubject, ssi.SubjectTransformDest, err)
-				}
+				return nil, fmt.Errorf("subject transform from '%s' to '%s' for the source %w", ssi.FilterSubject, ssi.SubjectTransformDest, err)
 			}
 		}
 	}