diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/SQLQueryParser.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/SQLQueryParser.java
index 801d04af673c..94420df0893f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/SQLQueryParser.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/SQLQueryParser.java
@@ -81,10 +81,15 @@ protected String substituteBrackets(String sqlQuery) throws QueryException {
 			final char ch = sqlQuery.charAt( index );
 			switch (ch) {
 				case '\'':
-					if (!doubleQuoted && !escaped) {
-						singleQuoted = !singleQuoted;
+					if (escaped) {
+						token.append(ch);
+					}
+					else {
+						if (!doubleQuoted) {
+							singleQuoted = !singleQuoted;
+						}
+						result.append(ch);
 					}
-					result.append(ch);
 					break;
 				case '"':
 					if (!singleQuoted && !escaped) {
@@ -216,7 +221,7 @@ private String resolveCollectionProperties(
 				}
 				aliasesFound++;
 				return collectionPersister.selectFragment( aliasName, collectionSuffix )
-						+ ", " + resolveProperties( aliasName, propertyName );
+					+ ", " + resolveProperties( aliasName, propertyName );
 			case "element.*":
 				return resolveProperties( aliasName, "*" );
 			default:
@@ -266,7 +271,7 @@ private void validate(String aliasName, String propertyName, String[] columnAlia
 			// TODO: better error message since we actually support composites if names are explicitly listed
 			throw new QueryException(
 					"SQL queries only support properties mapped to a single column - property [" +
-							propertyName + "] is mapped to " + columnAliases.length + " columns.",
+					propertyName + "] is mapped to " + columnAliases.length + " columns.",
 					originalQueryString
 			);
 		}