diff --git a/ckanext/datastore/logic/action.py b/ckanext/datastore/logic/action.py
index f10820a6a59..62053240dbe 100644
--- a/ckanext/datastore/logic/action.py
+++ b/ckanext/datastore/logic/action.py
@@ -173,13 +173,15 @@ def datastore_create(context, data_dict):
             result = data_dict
         else:
             result = backend.create(context, data_dict)
-
     except InvalidDataError as err:
         raise p.toolkit.ValidationError(unicode(err))
+
     # Set the datastore_active flag on the resource if necessary
-    if resource.extras.get('datastore_active') is not True:
+    model = _get_or_bust(context, 'model')
+    resobj = model.Resource.get(data_dict['resource_id'])
+    if resobj.extras.get('datastore_active') is not True:
         log.debug(
-            'Setting datastore_active=True on resource {0}'.format(resource.id)
+            'Setting datastore_active=True on resource {0}'.format(resobj.id)
         )
         set_datastore_active_flag(model, data_dict, True)