diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/TextInputControl.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/TextInputControl.java
index da7593b..ad71344 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/TextInputControl.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/TextInputControl.java
@@ -240,7 +240,7 @@
     {
         // Lookup and Print value
         Options options = vi.getOptions();
-        if (options != null && !options.isEmpty())
+        if (options != null && !options.isEmpty() && !hasFormatOption(vi, "nolookup"))
         { // Check for Options
             String text = options.get(value);
             if (StringUtils.isNotEmpty(text))