diff --git a/src/GenericModel.php b/src/GenericModel.php
index bc35e55..c25de8b 100644
--- a/src/GenericModel.php
+++ b/src/GenericModel.php
@@ -335,6 +335,16 @@ public static function enableRegistry(): void
         static::$registry = true;
     }
 
+    /**
+     * Check if the registry is enabled
+     *
+     * @return bool
+     */
+    public static function isRegistryEnabled(): bool
+    {
+        return static::$registry;
+    }
+
     /**
      *
      *
diff --git a/test/tests/GenericModelTest.php b/test/tests/GenericModelTest.php
new file mode 100644
index 0000000..bd885b1
--- /dev/null
+++ b/test/tests/GenericModelTest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Aternos\Model\Test\Tests;
+
+use Aternos\Model\GenericModel;
+use PHPUnit\Framework\TestCase;
+
+class GenericModelTest extends TestCase
+{
+    public function testRegistry(): void
+    {
+        $this->assertTrue(GenericModel::isRegistryEnabled());
+        GenericModel::disableRegistry();
+        $this->assertFalse(GenericModel::isRegistryEnabled());
+        GenericModel::enableRegistry();
+        $this->assertTrue(GenericModel::isRegistryEnabled());
+    }
+}