diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index 588f2ed6b..ee6878502 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -44,7 +44,11 @@ class NotificationsController < ApplicationController
       when "Topic"
         community_topic_path @notification.linkable_resource.community, @notification.linkable_resource
       else
-        url_for @notification.linkable_resource
+        if @notification.linkable_resource.is_a?(AdminNotification)
+          @notification.linkable_resource.link || notifications_path
+        else
+          url_for @notification.linkable_resource
+        end
       end
     end
 
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 33bf7701c..dacedb762 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -53,9 +53,19 @@ class Notification < ActiveRecord::Base
       "proposal_notification"
     when "Comment"
       "replies_to"
+    when "AdminNotification"
+      nil
     else
       "comments_on"
     end
   end
 
-end
\ No newline at end of file
+  def link
+    if notifiable.is_a?(AdminNotification) && notifiable.link.blank?
+      nil
+    else
+      self
+    end
+  end
+
+end