diff --git a/sstables/sstables.cc b/sstables/sstables.cc
index f2e7d8ab91..df46f37dc1 100644
--- a/sstables/sstables.cc
+++ b/sstables/sstables.cc
@@ -2943,9 +2943,10 @@ mutation_source sstable::as_mutation_source() {
 }
 
 sstable::sstable(schema_ptr schema,
+        sstring table_dir,
         const data_dictionary::storage_options& storage,
-        sstring dir,
         generation_type generation,
+        sstable_state state,
         version_types v,
         format_types f,
         db::large_data_handler& large_data_handler,
@@ -2956,7 +2957,7 @@ sstable::sstable(schema_ptr schema,
     : sstable_buffer_size(buffer_size)
     , _schema(std::move(schema))
     , _generation(generation)
-    , _storage(make_storage(manager, storage, std::move(dir)))
+    , _storage(make_storage(manager, storage, make_path(table_dir, state).native()))
     , _version(v)
     , _format(f)
     , _index_cache(std::make_unique<partition_index_cache>(
diff --git a/sstables/sstables.hh b/sstables/sstables.hh
index ddadf867ba..ce96c0013c 100644
--- a/sstables/sstables.hh
+++ b/sstables/sstables.hh
@@ -180,9 +180,10 @@ public:
     using manager_link_type = bi::list_member_hook<bi::link_mode<bi::auto_unlink>>;
 public:
     sstable(schema_ptr schema,
+            sstring table_dir,
             const data_dictionary::storage_options& storage,
-            sstring dir,
             generation_type generation,
+            sstable_state state,
             version_types v,
             format_types f,
             db::large_data_handler& large_data_handler,
diff --git a/sstables/sstables_manager.cc b/sstables/sstables_manager.cc
index ecde4bf3fa..8a15d9204d 100644
--- a/sstables/sstables_manager.cc
+++ b/sstables/sstables_manager.cc
@@ -111,7 +111,7 @@ shared_sstable sstables_manager::make_sstable(schema_ptr schema,
         gc_clock::time_point now,
         io_error_handler_gen error_handler_gen,
         size_t buffer_size) {
-    return make_lw_shared<sstable>(std::move(schema), storage, make_path(table_dir, state).native(), generation, v, f, get_large_data_handler(), *this, now, std::move(error_handler_gen), buffer_size);
+    return make_lw_shared<sstable>(std::move(schema), std::move(table_dir), storage, generation, state, v, f, get_large_data_handler(), *this, now, std::move(error_handler_gen), buffer_size);
 }
 
 sstable_writer_config sstables_manager::configure_writer(sstring origin) const {