diff --git a/packages/cp-frontend/src/containers/service/scale.js b/packages/cp-frontend/src/containers/service/scale.js
index e4732db6..af89951b 100644
--- a/packages/cp-frontend/src/containers/service/scale.js
+++ b/packages/cp-frontend/src/containers/service/scale.js
@@ -31,6 +31,20 @@ class ServiceScale extends Component {
       }
     };
 
+    const handleCloseClick = evt => {
+      const closeUrl = match.url.split('/').slice(0, -2).join('/');
+      history.replace(closeUrl);
+    };
+
+    const handleSubmitClick = values => {
+      scale(service.id, values.replicas).then(handleCloseClick);
+    };
+
+    if (!service) {
+      setTimeout(handleCloseClick, 33);
+      return null;
+    }
+
     const ServiceScaleForm = reduxForm({
       form: 'scale-service',
       destroyOnUnmount: true,
@@ -41,15 +55,6 @@ class ServiceScale extends Component {
       }
     })(ServiceScaleComponent);
 
-    const handleCloseClick = evt => {
-      const closeUrl = match.url.split('/').slice(0, -2).join('/');
-      history.replace(closeUrl);
-    };
-
-    const handleSubmitClick = values => {
-      scale(service.id, values.replicas).then(handleCloseClick);
-    };
-
     return (
       <Modal width={460} onCloseClick={handleCloseClick}>
         <ServiceScaleForm