diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/JsonMessageSource.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/JsonMessageSource.java
index e76c12209..c96848dea 100644
--- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/JsonMessageSource.java
+++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/JsonMessageSource.java
@@ -58,6 +58,8 @@ public class JsonMessageSource extends AbstractMessageSource {
 		this.config = config;
 	}
 
+
+
 	@Override
 	protected MessageFormat resolveCode(String code, Locale locale) {
 
@@ -73,7 +75,7 @@ public class JsonMessageSource extends AbstractMessageSource {
 
 		if (value == null) {
 			// if it's still null, return null
-			return null;
+			return new MessageFormat(code, locale);
 		} else {
 			// otherwise format the message
 			return new MessageFormat(value, locale);
diff --git a/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/config/TestJsonMessageSource.java b/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/config/TestJsonMessageSource.java
index 0afbc9505..4611d9fb9 100644
--- a/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/config/TestJsonMessageSource.java
+++ b/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/config/TestJsonMessageSource.java
@@ -43,7 +43,8 @@ public class TestJsonMessageSource {
 
 	@Test
 	public void verifyWhenLocaleDoesNotExist_cannotResolveCode() {
+		String code = "test";
 		MessageFormat mf = jsonMessageSource.resolveCode("test", localeThatDoesNotHaveAFile);
-		assertNull(mf);
+		assertEquals(code, mf.toPattern());
 	}
 }