diff --git a/app/models/stream_entry.rb b/app/models/stream_entry.rb
index 0df7ece606..bc4821ca92 100644
--- a/app/models/stream_entry.rb
+++ b/app/models/stream_entry.rb
@@ -39,7 +39,7 @@ class StreamEntry < ApplicationRecord
   end
 
   def threaded?
-    verb == :favorite || object_type == :comment
+    (verb == :favorite || object_type == :comment) && !thread.nil?
   end
 
   def thread
diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index d24b803e64..4ed0bf0bb3 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -214,7 +214,7 @@ class ProcessFeedService < BaseService
   def object_type(xml)
     xml.at_xpath('./activity:object-type').content.gsub('http://activitystrea.ms/schema/1.0/', '').to_sym
   rescue
-    :note
+    :activity
   end
 
   def verb(xml)