diff --git a/app/models/project.rb b/app/models/project.rb
index 79d999656..6b8a5d09f 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -152,12 +152,15 @@ class Project < ActiveRecord::Base
       project_my_modules
         .joins(:experiment)
         .where('experiments.archived=false')
+        .where('my_modules.archived=false')
+
     else
       project_my_modules
         .joins(:user_my_modules)
         .joins(:experiment)
         .where('experiments.archived=false AND user_my_modules.user_id IN (?)',
                user.id)
+        .where('my_modules.archived=false')
         .distinct
     end
   end