diff --git a/endpoints_proto_datastore/ndb/model.py b/endpoints_proto_datastore/ndb/model.py
index 64aaae2..3fabeb4 100644
--- a/endpoints_proto_datastore/ndb/model.py
+++ b/endpoints_proto_datastore/ndb/model.py
@@ -14,7 +14,6 @@
   import json
 except ImportError:
   import simplejson as json
-import pickle
 import re
 
 import endpoints
@@ -100,8 +99,6 @@
     return prop.ToValue(value)
   elif isinstance(prop, ndb.JsonProperty):
     return json.dumps(value)
-  elif isinstance(prop, ndb.PickleProperty):
-    return pickle.dumps(value)
   elif isinstance(prop, ndb.UserProperty):
     return utils.UserMessageFromUser(value)
   elif isinstance(prop, ndb.GeoPtProperty):
@@ -148,8 +145,6 @@
     return prop.FromValue(value)
   elif isinstance(prop, ndb.JsonProperty):
     return json.loads(value)
-  elif isinstance(prop, ndb.PickleProperty):
-    return pickle.loads(value)
   elif isinstance(prop, ndb.UserProperty):
     return utils.UserMessageToUser(value)
   elif isinstance(prop, ndb.GeoPtProperty):
diff --git a/endpoints_proto_datastore/ndb/utils.py b/endpoints_proto_datastore/ndb/utils.py
index 4111092..5f3ad94 100644
--- a/endpoints_proto_datastore/ndb/utils.py
+++ b/endpoints_proto_datastore/ndb/utils.py
@@ -60,7 +60,7 @@
     ndb.ModelKey: RaiseNotImplementedMethod(
         ndb.ModelKey,
         explanation=MODEL_KEY_EXPLANATION),
-    ndb.PickleProperty: messages.BytesField,
+    ndb.PickleProperty: messages.StringField,
     ndb.Property: RaiseNotImplementedMethod(ndb.Property),
     ndb.StringProperty: messages.StringField,
     ndb.TextProperty: messages.StringField,  # No concept of compressed here