diff --git a/lib/diaspora/user/querying.rb b/lib/diaspora/user/querying.rb
index b259d8ffd017331160fa7201de668616581141c5..64de244f996d2cc73b8ce9f44755988f7f66de9b 100644
--- a/lib/diaspora/user/querying.rb
+++ b/lib/diaspora/user/querying.rb
@@ -126,7 +126,7 @@ module Diaspora
       # @return [Hash]
       def prep_opts(opts)
         defaults = {
-          :type => AspectStream::TYPES_OF_POST_IN_STREAM, 
+          :type => BaseStream::TYPES_OF_POST_IN_STREAM, 
           :order => 'created_at DESC',
           :limit => 15,
           :hidden => false
diff --git a/spec/models/user/querying_spec.rb b/spec/models/user/querying_spec.rb
index 85a154642df904f525425346d4446077cbadb7b9..58e75567315e873200deb401b1046be7d8968e8a 100644
--- a/spec/models/user/querying_spec.rb
+++ b/spec/models/user/querying_spec.rb
@@ -140,6 +140,22 @@ describe User do
     end
   end
   
+  describe "#prep_opts" do
+    it "defaults the opts" do
+      time = Time.now
+      Time.stub(:now).and_return(time)
+      alice.send(:prep_opts, {}).should == {
+        :type => BaseStream::TYPES_OF_POST_IN_STREAM, 
+        :order => 'created_at DESC',
+        :limit => 15,
+        :hidden => false,
+        :order_field => :created_at,
+        :order_with_table => "posts.created_at DESC",
+        :max_time => time + 1
+      }
+    end
+  end
+
   describe "#visible_posts" do
     context 'with many posts' do
       before do