diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMapPropertyAccessor.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMapPropertyAccessor.java
index b7d3c10b7..2737970f2 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMapPropertyAccessor.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMapPropertyAccessor.java
@@ -88,14 +88,7 @@ public class XWorkMapPropertyAccessor extends MapPropertyAccessor {
 
             String lastProperty = (String) context.get(XWorkConverter.LAST_BEAN_PROPERTY_ACCESSED);
             if (lastClass == null || lastProperty == null) {
-                return super.getProperty(context, target, name);
-            }
-            Class keyClass = objectTypeDeterminer
-                    .getKeyClass(lastClass, lastProperty);
-
-            if (keyClass == null) {
-
-                keyClass = java.lang.String.class;
+                return null;
             }
             Object key = getKey(context, name);
             Map map = (Map) target;