diff --git a/snd/src/org/labkey/snd/query/AttributeDataTable.java b/snd/src/org/labkey/snd/query/AttributeDataTable.java
index 3c907ed08..81d343671 100644
--- a/snd/src/org/labkey/snd/query/AttributeDataTable.java
+++ b/snd/src/org/labkey/snd/query/AttributeDataTable.java
@@ -434,8 +434,9 @@ public List<Map<String, Object>> deleteRows(User user, Container container, List
             {
                 for (Map<String, Object> row : oldRows)
                 {
-                    Integer objectId = (Integer) row.get("ObjectId");
-                    Integer propertyId = (Integer) row.get("PropertyId");
+                    // exp.ObjectProperty.ObjectId is BIGINT as of exp 25.005, so the value arrives as a Long
+                    Number objectId = (Number) row.get("ObjectId");
+                    Number propertyId = (Number) row.get("PropertyId");
 
                     SqlExecutor executor = new SqlExecutor(_expSchema);
                     SQLFragment deleteObjProp = new SQLFragment("delete from " + _expSchema.getName() + ".ObjectProperty\n");
diff --git a/snd/src/org/labkey/snd/query/EventDataTable.java b/snd/src/org/labkey/snd/query/EventDataTable.java
index f7ddb2d1f..1c9bce9d6 100644
--- a/snd/src/org/labkey/snd/query/EventDataTable.java
+++ b/snd/src/org/labkey/snd/query/EventDataTable.java
@@ -68,7 +68,7 @@ public EventDataTable(SNDUserSchema schema, TableInfo table)
     @Override
     public void addColumns()
     {
-        BaseColumnInfo objectid = new BaseColumnInfo("ObjectId", this, JdbcType.INTEGER)
+        BaseColumnInfo objectid = new BaseColumnInfo("ObjectId", this, JdbcType.BIGINT)
         {
             @Override
             public SQLFragment getValueSql(String tableAliasName)