diff --git a/api/src/main/java/org/openmrs/ConceptStopWord.java b/api/src/main/java/org/openmrs/ConceptStopWord.java
index d49508ac988..d8b8712ddd3 100644
--- a/api/src/main/java/org/openmrs/ConceptStopWord.java
+++ b/api/src/main/java/org/openmrs/ConceptStopWord.java
@@ -14,6 +14,13 @@
 import org.hibernate.envers.Audited;
 import org.openmrs.api.context.Context;
 import org.springframework.util.StringUtils;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.Id;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Column;
+
 
 /**
  * ConceptStopWord is the real world term used to filter the words for indexing
@@ -23,15 +30,22 @@
  * @since 1.8
  */
 @Audited
+@Entity
+@Table(name = "concept_stop_word")
 public class ConceptStopWord extends BaseOpenmrsObject {
 	
 	private static final long serialVersionUID = 3671020002642184656L;
 	
 	// Fields
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "concept_stop_word_id", nullable = false)
 	private Integer conceptStopWordId;
-	
+
+	@Column(name = "word", nullable = false, length = 50)
 	private String value;
-	
+
+	@Column(name = "locale", nullable = false, length = 20)
 	private Locale locale;
 	
 	// Constructors
diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml
index 3a12ab71b2b..98c762b87d9 100644
--- a/api/src/main/resources/hibernate.cfg.xml
+++ b/api/src/main/resources/hibernate.cfg.xml
@@ -25,7 +25,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptName.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptProposal.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptSet.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/ConceptStopWord.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/DiagnosisAttribute.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/DiagnosisAttributeType.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/FieldType.hbm.xml" />
@@ -75,6 +74,7 @@
 		<!-- These mappings are required because of references in Obs & Concept -->
 		<mapping class="org.openmrs.ObsReferenceRange"/>
 		<mapping class="org.openmrs.ConceptReferenceRange"/>
-  </session-factory>
+		
+	</session-factory>
 
 </hibernate-configuration>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptStopWord.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptStopWord.hbm.xml
deleted file mode 100644
index 10577889bc0..00000000000
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptStopWord.hbm.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    This Source Code Form is subject to the terms of the Mozilla Public License,
-    v. 2.0. If a copy of the MPL was not distributed with this file, You can
-    obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
-    the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
-
-    Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
-    graphic logo is a trademark of OpenMRS Inc.
-
--->
-<!DOCTYPE hibernate-mapping PUBLIC
-        "-//Hibernate/Hibernate Mapping DTD 3.1//EN"
-        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.openmrs">
-
-	<class name="ConceptStopWord" table="concept_stop_word" batch-size="25">
-
-		<cache usage="read-write"/>
-
-		<id name="conceptStopWordId" type="int" column="concept_stop_word_id">
-			<generator class="native">
-				<param name="sequence">concept_stop_word_concept_stop_word_id_seq</param>
-			</generator>
-		</id>
-
-		<property name="value" column="word" type="java.lang.String" length="50" not-null="true"/>
-		<property name="locale" type="java.util.Locale" length="20" not-null="true"/>
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true"/>
-	</class>
-
-</hibernate-mapping>
diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
index bb55bb4be7c..45b85e939ee 100644
--- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java
+++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -36,6 +36,7 @@
 import org.openmrs.ConceptSource;
 import org.openmrs.ConceptStateConversion;
 import org.openmrs.ConceptReferenceTermMap;
+import org.openmrs.ConceptStopWord;
 import org.openmrs.Condition;
 import org.openmrs.Diagnosis;
 import org.openmrs.Drug;
@@ -2914,6 +2915,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 			    .addAnnotatedClass(ConceptDescription.class)
 			    .addAnnotatedClass(ConceptClass.class)
 			    .addAnnotatedClass(ConceptMap.class)
+			    .addAnnotatedClass(ConceptStopWord.class)
 				.addAnnotatedClass(FormResource.class)
 				.addAnnotatedClass(VisitType.class)
 				.addAnnotatedClass(ProviderRole.class)