diff --git a/src/entt/entity/organizer.hpp b/src/entt/entity/organizer.hpp
index ebda20b9a..67438e6fd 100644
--- a/src/entt/entity/organizer.hpp
+++ b/src/entt/entity/organizer.hpp
@@ -126,7 +126,7 @@ class basic_organizer final {
         if constexpr(std::is_same_v<Type, Registry>) {
             return reg;
         } else if constexpr(internal::is_view_v<Type>) {
-            return as_view{reg};
+            return static_cast<Type>(as_view{reg});
         } else {
             return reg.ctx().template emplace<std::remove_reference_t<Type>>();
         }
diff --git a/test/entt/entity/organizer.cpp b/test/entt/entity/organizer.cpp
index 30ddb175a..82db3f94f 100644
--- a/test/entt/entity/organizer.cpp
+++ b/test/entt/entity/organizer.cpp
@@ -1,5 +1,7 @@
 #include <cstddef>
+#include <utility>
 #include <gtest/gtest.h>
+#include <entt/core/type_info.hpp>
 #include <entt/entity/organizer.hpp>
 #include <entt/entity/registry.hpp>
 
@@ -363,6 +365,10 @@ TEST(Organizer, Prepare) {
     ASSERT_FALSE(registry.ctx().contains<char>());
     ASSERT_FALSE(registry.ctx().contains<double>());
 
+    ASSERT_EQ(std::as_const(registry).storage<int>(), nullptr);
+    ASSERT_EQ(std::as_const(registry).storage<char>(), nullptr);
+    ASSERT_EQ(std::as_const(registry).storage<double>(), nullptr);
+
     for(auto &&vertex: graph) {
         vertex.prepare(registry);
     }
@@ -370,6 +376,10 @@ TEST(Organizer, Prepare) {
     ASSERT_FALSE(registry.ctx().contains<int>());
     ASSERT_FALSE(registry.ctx().contains<char>());
     ASSERT_TRUE(registry.ctx().contains<double>());
+
+    ASSERT_NE(std::as_const(registry).storage<int>(), nullptr);
+    ASSERT_NE(std::as_const(registry).storage<char>(), nullptr);
+    ASSERT_EQ(std::as_const(registry).storage<double>(), nullptr);
 }
 
 TEST(Organizer, Dependencies) {