diff --git a/lib/Db/CredentialMapper.php b/lib/Db/CredentialMapper.php
index e26d2205..8fe720a7 100644
--- a/lib/Db/CredentialMapper.php
+++ b/lib/Db/CredentialMapper.php
@@ -34,7 +34,7 @@ class CredentialMapper extends Mapper {
 
 	public function getRandomCredentialByVaultId($vault_id, $user_id) {
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
-			'WHERE `user_id` = ? and vault_id = ? ORDER BY RAND() LIMIT 1';
+			'WHERE `user_id` = ? and vault_id = ? AND shared_key is NULL ORDER BY RAND() LIMIT 1';
 		return $this->findEntities($sql, [$user_id, $vault_id]);
 	}