diff --git a/schema_config.go b/schema_config.go
index b8983e5101cc2..7e8d498d89aa5 100644
--- a/schema_config.go
+++ b/schema_config.go
@@ -98,6 +98,7 @@ func (cfg *SchemaConfig) translate() error {
 			Store:  cfg.legacy.StorageClient,
 			IndexTables: PeriodicTableConfig{
 				Prefix: cfg.legacy.OriginalTableName,
+				Tags:   cfg.legacy.IndexTables.Tags,
 			},
 		})
 	}
diff --git a/table_manager.go b/table_manager.go
index 311619d7015f5..803a0831103f8 100644
--- a/table_manager.go
+++ b/table_manager.go
@@ -189,6 +189,10 @@ func (m *TableManager) calculateExpectedTables() []TableDesc {
 			continue
 		}
 		if config.IndexTables.Period == 0 { // non-periodic table
+			if len(result) > 0 && result[len(result)-1].Name == config.IndexTables.Prefix {
+				continue // already got a non-periodic table with this name
+			}
+
 			table := TableDesc{
 				Name:             config.IndexTables.Prefix,
 				ProvisionedRead:  config.IndexTables.InactiveReadThroughput,