diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DummyResourceSetService.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DummyResourceSetService.java
new file mode 100644
index 000000000..2c0e89364
--- /dev/null
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DummyResourceSetService.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright 2015 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *******************************************************************************/
+
+package org.mitre.openid.connect.service.impl;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import org.mitre.uma.model.ResourceSet;
+import org.mitre.uma.service.ResourceSetService;
+import org.springframework.stereotype.Service;
+
+/**
+ * Dummy resource set service that doesn't do anything; acts as a stub for the 
+ * introspection service when the UMA functionality is disabled.
+ * 
+ * @author jricher
+ *
+ */
+@Service
+public class DummyResourceSetService implements ResourceSetService {
+
+	@Override
+	public ResourceSet saveNew(ResourceSet rs) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public ResourceSet getById(Long id) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public ResourceSet update(ResourceSet oldRs, ResourceSet newRs) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void remove(ResourceSet rs) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public Collection<ResourceSet> getAllForOwner(String owner) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public Collection<ResourceSet> getAllForOwnerAndClient(String owner, String authClientId) {
+		return Collections.emptySet();
+	}
+
+}
diff --git a/uma-server/src/main/java/org/mitre/uma/service/impl/DefaultResourceSetService.java b/uma-server/src/main/java/org/mitre/uma/service/impl/DefaultResourceSetService.java
index 0353026bf..ffefbc68e 100644
--- a/uma-server/src/main/java/org/mitre/uma/service/impl/DefaultResourceSetService.java
+++ b/uma-server/src/main/java/org/mitre/uma/service/impl/DefaultResourceSetService.java
@@ -25,6 +25,7 @@ import org.mitre.uma.service.ResourceSetService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 
 /**
@@ -32,6 +33,7 @@ import org.springframework.stereotype.Service;
  *
  */
 @Service
+@Primary
 public class DefaultResourceSetService implements ResourceSetService {
 
 	private static final Logger logger = LoggerFactory.getLogger(DefaultResourceSetService.class);