diff --git a/app/models/middleware_server.rb b/app/models/middleware_server.rb
index a62630bd0d6..3f951ef53b0 100644
--- a/app/models/middleware_server.rb
+++ b/app/models/middleware_server.rb
@@ -11,6 +11,8 @@ class MiddlewareServer < ApplicationRecord
   serialize :properties
   acts_as_miq_taggable
 
+  validates :feed, :presence => true
+
   def properties
     super || {}
   end
diff --git a/spec/factories/middleware_servers.rb b/spec/factories/middleware_servers.rb
index be1a1efa42e..7af5f2feb31 100644
--- a/spec/factories/middleware_servers.rb
+++ b/spec/factories/middleware_servers.rb
@@ -1,6 +1,7 @@
 FactoryGirl.define do
   factory :middleware_server do
     sequence(:name) { |n| "middleware_server_#{seq_padded_for_sorting(n)}" }
+    sequence(:feed) { |n| "feed_#{n}" }
   end
 
   factory :hawkular_middleware_server,