diff --git a/base/src/org/compiere/model/MRequestType.java b/base/src/org/compiere/model/MRequestType.java
index be9ba2be5c..4fc9f4a006 100644
--- a/base/src/org/compiere/model/MRequestType.java
+++ b/base/src/org/compiere/model/MRequestType.java
@@ -21,6 +21,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
 import java.util.logging.Level;
 
@@ -74,39 +75,14 @@ public class MRequestType extends X_R_RequestType
 	 */
 	public static MRequestType getDefault (Properties ctx)
 	{
-		MRequestType retValue = null;
 		int AD_Client_ID = Env.getAD_Client_ID(ctx);
-		String sql = "SELECT * FROM R_RequestType "
-			+ "WHERE AD_Client_ID IN (0," + AD_Client_ID + ") "
-			+ "ORDER BY IsDefault DESC, AD_Client_ID DESC";
-		PreparedStatement pstmt = null;
-		try
-		{
-			pstmt = DB.prepareStatement (sql, null);
-			ResultSet rs = pstmt.executeQuery ();
-			if (rs.next ())
-			{
-				retValue = new MRequestType (ctx, rs, null);
-				if (!retValue.isDefault())
-					retValue = null;
-			}
-			rs.close ();
-			pstmt.close ();
-			pstmt = null;
-		}
-		catch (SQLException ex)
-		{
-			s_log.log(Level.SEVERE, sql, ex);
-		}
-		try
-		{
-			if (pstmt != null)
-				pstmt.close ();
-		}
-		catch (SQLException ex1)
-		{
-		}
-		pstmt = null;
+ 
+		//FR: [ 2214883 ] Remove SQL code and Replace for Query - red1
+		String whereClause = "AD_Client_ID IN (0," + AD_Client_ID + ")";
+		MRequestType retValue = new Query(ctx, I_R_RequestType.Table_Name, whereClause, null)
+			.setOrderBy("IsDefault DESC, AD_Client_ID DESC")
+			.first();
+	
 		return retValue;
 	}	//	get
 
diff --git a/extend/src/test/functional/MRequestTypeTest.java b/extend/src/test/functional/MRequestTypeTest.java
new file mode 100644
index 0000000000..f631bc4bd2
--- /dev/null
+++ b/extend/src/test/functional/MRequestTypeTest.java
@@ -0,0 +1,40 @@
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 2008 SC ARHIPAC SERVICE SRL. All Rights Reserved.            *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package test.functional;
+
+import org.compiere.model.MRequestType;
+import org.compiere.util.Env;
+
+import test.AdempiereTestCase;
+
+/**
+ * @author Teo Sarca, www.arhipac.ro
+ */
+public class MRequestTypeTest extends AdempiereTestCase
+{
+	@Override
+	protected void setUp() throws Exception
+	{
+		super.setUp();
+		assertEquals("Client is not GardenWorld", 11, Env.getAD_Client_ID(getCtx()));
+	}
+	
+	public void testQuery() throws Exception
+	{
+ 		MRequestType req = MRequestType.getDefault(getCtx());
+		assertTrue("There should be default requesttype", req.getAD_Client_ID() == 11);
+
+	}
+
+}