diff --git a/userapi/storage/shared/storage.go b/userapi/storage/shared/storage.go
index ed74fe8f4..cfc149bf1 100644
--- a/userapi/storage/shared/storage.go
+++ b/userapi/storage/shared/storage.go
@@ -650,7 +650,7 @@ func (d *Database) CreateDevice(
 			}
 		}
 	}
-	return
+	return dev, returnErr
 }
 
 // generateDeviceID creates a new device id. Returns an error if failed to generate