diff --git a/src/resolver/resolver.cc b/src/resolver/resolver.cc
index d7bb477..3d11a23 100644
--- a/src/resolver/resolver.cc
+++ b/src/resolver/resolver.cc
@@ -321,6 +321,14 @@
 
   if (auto* str =
           func->return_type()->UnwrapAliasIfNeeded()->As<type::Struct>()) {
+    if (!ApplyStorageClassUsageToType(ast::StorageClass::kNone, str,
+                                      func->source())) {
+      diagnostics_.add_note("while instantiating return type for " +
+                                builder_->Symbols().NameFor(func->symbol()),
+                            func->source());
+      return false;
+    }
+
     auto* info = Structure(str);
     if (!info) {
       return false;
diff --git a/src/resolver/struct_storage_class_use_test.cc b/src/resolver/struct_storage_class_use_test.cc
index 05db907..8213758 100644
--- a/src/resolver/struct_storage_class_use_test.cc
+++ b/src/resolver/struct_storage_class_use_test.cc
@@ -49,6 +49,19 @@
               UnorderedElementsAre(ast::StorageClass::kNone));
 }
 
+TEST_F(ResolverStorageClassUseTest, StructReachableFromReturnType) {
+  auto* s = Structure("S", {Member("a", ty.f32())});
+
+  Func("f", {}, s, {Return(Construct(s))}, {});
+
+  ASSERT_TRUE(r()->Resolve()) << r()->error();
+
+  auto* sem = Sem().Get(s);
+  ASSERT_NE(sem, nullptr);
+  EXPECT_THAT(sem->StorageClassUsage(),
+              UnorderedElementsAre(ast::StorageClass::kNone));
+}
+
 TEST_F(ResolverStorageClassUseTest, StructReachableFromGlobal) {
   auto* s = Structure("S", {Member("a", ty.f32())});