diff --git a/controller/database.py b/controller/database.py
index 9e5ec84..c94db37 100644
--- a/controller/database.py
+++ b/controller/database.py
@@ -252,7 +252,7 @@ def fetch_breeders_list(self):
     def insert_credential(self, credential_id, name, credential_type, description, windmill_variable, store_type='windmill_variable', metadata=None):
         """Insert credential catalog entry"""
         db_config = self._get_db_config()
-        metadata_json = json.dumps(metadata) if metadata else 'NULL'
+        metadata_json = "'" + json.dumps(metadata).replace("'", "''") + "'" if metadata else 'NULL'
         description_escaped = "'" + description.replace("'", "''") + "'" if description else 'NULL'
         
         query = f"""
@@ -336,7 +336,7 @@ def insert_target(self, target_id, name, target_type, spec, metadata=None):
         """Insert target catalog entry"""
         db_config = self._get_db_config()
         spec_json = json.dumps(spec) if isinstance(spec, dict) else spec
-        metadata_json = json.dumps(metadata) if metadata else 'NULL'
+        metadata_json = "'" + json.dumps(metadata).replace("'", "''") + "'" if metadata else 'NULL'
 
         query = f"""
         INSERT INTO {self.targets_table_name}