diff --git a/engine/src/core/com/jme3/scene/Spatial.java b/engine/src/core/com/jme3/scene/Spatial.java
index f82c39cf3..205610b5f 100644
--- a/engine/src/core/com/jme3/scene/Spatial.java
+++ b/engine/src/core/com/jme3/scene/Spatial.java
@@ -1157,16 +1157,16 @@ public abstract class Spatial implements Savable, Cloneable, Collidable {
         }
     }
 
-    public Object getUserData(String key) {
+    public <T> T getUserData(String key) {
         if (userData == null) {
             return null;
         }
 
         Savable s = userData.get(key);
         if (s instanceof UserData) {
-            return ((UserData) s).getValue();
+            return (T)((UserData) s).getValue();
         } else {
-            return s;
+            return (T)s;
         }
     }