diff --git a/app/Utils/Traits/MakesHash.php b/app/Utils/Traits/MakesHash.php
index f453fc7bb34e..8995366405af 100644
--- a/app/Utils/Traits/MakesHash.php
+++ b/app/Utils/Traits/MakesHash.php
@@ -37,7 +37,10 @@ trait MakesHash
      */
     public function createDbHash($db) : string
     {
-        return  $this->getDbCode($db).'-'. Str::random(config('ninja.key_length'));
+        if(config('ninja.db.multi_db_enabled'))
+            return  $this->getDbCode($db).'-'. Str::random(config('ninja.key_length'));
+
+        return Str::random(config('ninja.key_length'));
     }
 
     /**