diff --git a/server/kapacitors.go b/server/kapacitors.go
index cb97152eb2..ff8bc59d21 100644
--- a/server/kapacitors.go
+++ b/server/kapacitors.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
-	"strconv"
 
 	"github.com/bouk/httprouter"
 	"github.com/influxdata/chronograf"
@@ -43,7 +42,7 @@ type kapaLinks struct {
 }
 
 type kapacitor struct {
-	ID       string    `json:"id,string"`          // Unique identifier representing a kapacitor instance.
+	ID       int       `json:"id,string"`          // Unique identifier representing a kapacitor instance.
 	Name     string    `json:"name"`               // User facing name of kapacitor instance.
 	URL      string    `json:"url"`                // URL for the kapacitor backend (e.g. http://localhost:9092)
 	Username string    `json:"username,omitempty"` // Username for authentication to kapacitor
@@ -98,7 +97,7 @@ func (h *Service) NewKapacitor(w http.ResponseWriter, r *http.Request) {
 func newKapacitor(srv chronograf.Server) kapacitor {
 	httpAPISrcs := "/chronograf/v1/sources"
 	return kapacitor{
-		ID:       strconv.Itoa(srv.ID),
+		ID:       srv.ID,
 		Name:     srv.Name,
 		Username: srv.Username,
 		Password: srv.Password,
@@ -117,6 +116,12 @@ type kapacitors struct {
 
 // Kapacitors retrieves all kapacitors from store.
 func (h *Service) Kapacitors(w http.ResponseWriter, r *http.Request) {
+	srcID, err := paramID("id", r)
+	if err != nil {
+		Error(w, http.StatusUnprocessableEntity, err.Error(), h.Logger)
+		return
+	}
+
 	ctx := r.Context()
 	mrSrvs, err := h.ServersStore.All(ctx)
 	if err != nil {
@@ -124,9 +129,11 @@ func (h *Service) Kapacitors(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	srvs := make([]kapacitor, len(mrSrvs))
-	for i, srv := range mrSrvs {
-		srvs[i] = newKapacitor(srv)
+	srvs := []kapacitor{}
+	for _, srv := range mrSrvs {
+		if srv.SrcID == srcID {
+			srvs = append(srvs, newKapacitor(srv))
+		}
 	}
 
 	res := kapacitors{
@@ -186,6 +193,22 @@ func (h *Service) RemoveKapacitor(w http.ResponseWriter, r *http.Request) {
 		unknownErrorWithMessage(w, err, h.Logger)
 		return
 	}
+
+	// Now delete all the associated rules
+	rules, err := h.AlertRulesStore.All(ctx, srcID, id)
+	if err != nil {
+		unknownErrorWithMessage(w, err, h.Logger)
+		return
+	}
+
+	for _, rule := range rules {
+		h.Logger.Debug("Deleting kapacitor rule resource id ", rule.ID)
+		if err := h.AlertRulesStore.Delete(ctx, srcID, id, rule); err != nil {
+			unknownErrorWithMessage(w, err, h.Logger)
+			return
+		}
+	}
+
 	w.WriteHeader(http.StatusNoContent)
 }
 
diff --git a/server/sources.go b/server/sources.go
index 2ba2d29e5a..e9a3791e62 100644
--- a/server/sources.go
+++ b/server/sources.go
@@ -1,6 +1,7 @@
 package server
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -125,9 +126,57 @@ func (h *Service) RemoveSource(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// Remove all the associated kapacitors for this source
+	if err = h.removeSrcsKapa(ctx, id); err != nil {
+		unknownErrorWithMessage(w, err, h.Logger)
+		return
+	}
+
 	w.WriteHeader(http.StatusNoContent)
 }
 
+// removeSrcsKapa will remove all kapacitors and kapacitor rules from the stores.
+// However, it will not remove the kapacitor tickscript from kapacitor itself.
+func (h *Service) removeSrcsKapa(ctx context.Context, srcID int) error {
+	kapas, err := h.ServersStore.All(ctx)
+	if err != nil {
+		return err
+	}
+
+	// Filter the kapacitors to delete by matching the source id
+	deleteKapa := []int{}
+	for _, kapa := range kapas {
+		if kapa.SrcID == srcID {
+			deleteKapa = append(deleteKapa, kapa.ID)
+		}
+	}
+
+	for _, kapaID := range deleteKapa {
+		kapa := chronograf.Server{
+			ID: kapaID,
+		}
+		h.Logger.Debug("Deleting kapacitor resource id ", kapa.ID)
+
+		if err := h.ServersStore.Delete(ctx, kapa); err != nil {
+			return err
+		}
+		// Now delete all the associated rules
+		rules, err := h.AlertRulesStore.All(ctx, srcID, kapaID)
+		if err != nil {
+			return err
+		}
+
+		for _, rule := range rules {
+			h.Logger.Debug("Deleting kapacitor rule resource id ", rule.ID)
+			if err := h.AlertRulesStore.Delete(ctx, srcID, kapaID, rule); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
 // UpdateSource handles incremental updates of a data source
 func (h *Service) UpdateSource(w http.ResponseWriter, r *http.Request) {
 	id, err := paramID("id", r)
diff --git a/server/swagger.json b/server/swagger.json
index 042bf44538..815aa22aba 100644
--- a/server/swagger.json
+++ b/server/swagger.json
@@ -193,7 +193,7 @@
 						"required": true
 					}
 				],
-				"summary": "This specific data source will be removed from the data store",
+				"summary": "This specific data source will be removed from the data store.  All associated kapacitor resources and kapacitor rules resources are also removed.",
 				"responses": {
 					"204": {
 						"description": "data source has been removed"
@@ -847,7 +847,7 @@
 						"required": true
 					}
 				],
-				"summary": "This specific kapacitor will be removed.",
+				"summary": "This specific kapacitor will be removed. All associated rule resources will also be removed from the store.",
 				"responses": {
 					"204": {
 						"description": "kapacitor has been removed."